Fixes for issues with CanCan syntax

Looks like we were using outdated or simply incorrect cancan syntax
Merge branch 'master' of github.com:team461WBI/website

Looks like I had an outdated tree