Updated phantomjs to 1.9.7
Merge branch 'master' of https://github.com/giffdiff/box-yeoman

Conflicts:
	wercker-box.yml