remove protected_attributes
Merge branch 'master' of github.com:ProjectShepherd/shepherd