new sublime aliases (master)
breaking apart more stuff (master)
Merge branch 'master' of https://github.com/sorahn/dotfiles

Conflicts:
	home/.aliases