Merge branch 'master' into user_model_specs

Conflicts:
	spec/factories.rb
Merge pull request #7 from jwrobes/user_model_specs

User model specs
Merge branch 'master' into generate_moments_for_user