Merge pull request #231 from jaredbischof/master

Debugging nil pointer error.
Merge pull request #232 from jaredbischof/master

Fixed.
Adding default attributes index.
More updates to ACL controller for public user usage.
Edit to avoid race condition when adding indexes to Shock node mongo documents.
Merge pull request #2 from jaredbischof/master

Merge
Merge pull request #235 from jaredbischof/develop

See commits.