Merge pull request #12 from darkstar21/develop

got rid of emails and role from user
Merge pull request #13 from uncanny-piranha/develop

Merge develop into master 10/23/14