Merge pull request #134 from acmetech/master

start isolating the gems into proper environments
Fixed the group subquery for activity stream
Space missing to the left of {
add TODO items for new shoulda-matchers expect syntax coming in the next release