Merge branch 'upstream_master' into dev

# Conflicts:
#	Main.sublime-menu

Merge pull request colinta#92 from 0xdevalias/0xdevalias/side-by-side…

…-settings

update Main.sublime-menu to use edit_settings for side-by-side settings

Merge branch 'dev'

prefer "view.show_popup" over "sublime.status_message" for errors and…

… alerts

Updated menu postition

formatting

Switched to spaces

Merge pull request colinta#89 from maliayas/remove-html-popup

Don't use HTML popup for "No Difference" message

only support ST3

Merge pull request colinta#77 from Starli0n/master

Platform specific configuration and Environment variable expansion