Fix rake tasks
serge branch 'develop' of github.com:rainforestapp/rqd2 into develop