added a phone_number field to the user model, added it to the user related forms and updated the tests to test for presence, valid form, and that the field shows up on all the required forms.  this also means a migration was generated and the schema file was updated
renamed these files to be ...erb_spec instead of ...haml_spec since I have migrated all haml files to erb now
these are the renamed erb_spec files that used to be haml_spec
deleted old files not used anymore
updated .gitignore to ignore elastic beanstalk stuff
Merge branch 'dev'