Merge branch 'master' of ssh://github.com/bsingr/dotfiles

Conflicts:
	bash_profile
	install_scripts/sublime_text.sh
	slate