added User, Role models, and a massive configuration file for Flask-Security
updated conf for development
Merge branch 'master' of github.com:publicscience/argos
user and role merge fix
Merge branch 'ferristseng-master'