added sublime alias
Merge branch 'master' of github.com:smacke/dotfiles

Conflicts:
	bash_aliases