Re-organise Sublime Text settings
Clean up bash profile
Merge branch 'master' of github.com:evilmarty/dotfiles

Conflicts:
	Sublime Text 2/Package Control.sublime-settings
	Sublime Text 2/Packages/SideBarEnhancements/package-metadata.json
	com.googlecode.iterm2.plist