New aliases and brew formulas
Merge branch 'master' of https://github.com/sheedy/dotfiles

Conflicts:
	home/.homebrew/packages.txt