Update FAQ to ensure proper bundle --path
Merge pull request #680 from seanknox/master

Fix typo in FAQ
Merge branch 'master' of git://github.com/boxen/our-boxen
Update Puppetfile