Fixing Vagrantfile to reduce warnings in 1.1
Adding data json because Vagrant cannot parse ruby code in some environments
Merge branch 'fix-vagrantfile-1.1' into develop
Rename round 1
Merge branch 'fix-rename-bearsocial' into develop
Rake update
Add sublime project
Adding thin config
Bulk commit of tests and fixes
Removing spork
Adding fuubar
Adding some factories
Merge branch 'feature-tests' into develop