Heroku.
Fix nit.
Update User Preferences.
Update Sublime 2 Packages.
Update side dar settings.
Merge branch 'master' of github.com:alfakini/dotfiles

Conflicts:
	sublimetext/User/Package Control.sublime-settings