updated rails
removed a bunch of auto generated specs
adding cucumber tests
committing newsfeed
merging