new hipchat
Merge branch 'master' of https://github.com/davidpope/dotfiles

Conflicts:
	awesome/xinitrc