Typo
Merge pull request #658 from gfestari/typo

Typo
Install pypy 2.4
Updated bower to 1.3.11
Install tox
bump boxen-xquartz to 1.2.1
Merge pull request #663 from MarkVillacampa/master

bump boxen-xquartz to 1.2.1
Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
	Puppetfile.lock