Add hipchat to cask file
Merge branch 'master' of github.com:emarref/dotfiles

* 'master' of github.com:emarref/dotfiles:
  Install sublime text 3

Conflicts:
	.cask
Add my aliases