Fixes #285 latest RoR 3.x and devise changes
Merge remote-tracking branch 'upstream/master' into kandan-285

* upstream/master:
  Update .travis.yml
  Update .travis.yml
Merge pull request #286 from fusion94/kandan-285

Fixes #285 latest RoR 3.x and devise changes

tested locally as well.