support for rails 4
Merge branch 'master' of github.com:mash-ltd/tekeya