first pass at building user and permission models
finished first draft implementation of user models
Merge branch 'master' into user_models
updated regstration models and moved to registration app
Moved role choices to settings.py and removed Role Model
fixed naming due to removal of Role model
Merge branch 'master' into user_models
added param documentation for semantic_signal
Merge branch 'master' into user_models

Conflicts:
	sim/settings.py
Added user_registration model and moved SimContact and associated models to new app
updated SimContact model and added contact parser
finished implementation of user_registration models
Merge branch 'master' into user_registration

Conflicts:
	sim/settings.py
Merge pull request #51 from ireynolds/user_registration

User registration models