fixes rails scaffold override, cleans up some junk
Merge branch 'master' of github.com:mttdffy/action_permission