add phantomjs and hipchat

rename personal manifest name because my github account name has
changed :metal:
add hipchat
add ruby 1.8 and 1.9
Merge branch 'master' of github.com:takashi/my-boxen

Conflicts:
	Puppetfile
	modules/people/manifests/takashi.pp