Some new defaults and sublime packages
Merge branch 'master' of https://github.com/marcuswestin/dotfiles

Conflicts:
	Sublime-User/Package Control.sublime-settings
	files/bash_profile