Merge branch 'master' of https://github.com/eriksvedang/Sublime-Text-3

Conflicts:
	Packages/User/CabalBuild.sublime-build
	Packages/User/Package Control.last-run
	Packages/User/SublimeHaskell.sublime-settings
merged