Added .vagrant to .gitignore
Basic Ubuntu 12.04 box with ruby, postgres, redis, node, and nginx and a few others
Merge remote-tracking branch 'origin/master'