Remove apps from chrislopresto manifest
Going back to xquartz 1.1.0 for now
Updating instructions for module update
XQuartz 1.1.1
Merge branch 'mavericks3' of github.com:plyfe/our-boxen into mavericks3
Revert "XQuartz 1.1.1"

This reverts commit 0318bfd96e5f91413cb3276888e08ef553b4a646.
Merge branch 'mavericks3' of https://github.com/plyfe/our-boxen into mavericks3
Match chrislopresto manifest-ness to dliggat's for troubleshooting
Merge branch 'mavericks3' of github.com:plyfe/our-boxen into mavericks3
force UTF-8 encoding
Merge pull request #448 from indirect/cred_helper_encoding

force UTF-8 encoding in credential helper
Remove node v0.4 because it fails on 10.9
Merge pull request #455 from boxen/remove-node-0.4

Remove node v0.4 because it fails on 10.9
Node.js v0.4 no longer provided by default

as of 2fc3983825
Merge pull request #457 from celkins/patch-1

Node.js v0.4 no longer provided by default
Merging in latest - resolving merge conflicts
Commenting out apps before another run
Remove apps from chrislopresto manifest
Adding in plyfe upstream mavericks fixes