Add a few extra settings
Merge branch 'master' of github.com:astonecutter/dotfiles

Conflicts:
	.bash_profile
Added some Sublime config