Merge remote-tracking branch 'upstream/master' into setup-testing
Delete tests that we will rewrite in Rspec and Capybara
Don't require content for Posts
Merge pull request #336 from cvuong/setup-testing

Setup rspec, factorygirl, capybara and add Post validations
Merge remote-tracking branch 'upstream/master' into survey2
Add survey