begin to lock down areas to user permissions
Merge branch 'master' of github.com:justinhilles/admin