fixed user permission stuff
Merge branch 'forms' of https://github.com/Hobogrammer/visonhouse-rails into forms