Workaround for cancan rails 4 bug
Merge branch 'master' of https://github.com/SwampCo/motherlode