Update chrislopresto manifests
Remove reference to plyfe::dev_environment
Include latest version of foreman
Merge branch 'mavericks3' of https://github.com/plyfe/our-boxen into mavericks3

Conflicts:
	Puppetfile
	Puppetfile.lock
Switch to node casperjs/phantomjs installs
Update phantomjs and casperjs. Ditch textwrangler.
Fixing merge conflicts after merging in mavericks3
Add bower npm package for plyfeme project
Update puppet-ruby. Install 1.9.3-p545.
Upgrade puppet-ruby. Add ruby 2.1.1.
Update plyfeme project ruby version
A boxen manifest for Jared
Merge pull request #5 from plyfe/jared-manifest

A boxen manifest for Jared
Add vagrant.plyfe.me host entry for plyfeme
Add MaxPane Sublime plugin for chrislopresto
Add plyfe-widgets project manifest
Merge remote-tracking branch 'plyfe-boxen/master'
Resolving merge conflicts post ruby 2.1.1