made first_name, last_name fields in user model. Made new and edit user forms use same form.
added some rspec to user_spec
Ryan merging admin branch
mergin master into admin
merging master into admin
making one merge fix in the user model spec
updated user update method to bypass validation for manager edits
users factory
fixed merge conflict on users factory
modified tag and binary models due to FactoryGirl build errors, modified user_model_spec to account for changes made to user model
merged files
finished validation and validation specs for user model