Basic model started for Location and Location_Address
added full address method
added shoulda matchers for location_address
added shoulda matchers for location
Started work on user model
Further additions to user model
Fixed some failing tests for location and location address models
Merge pull request #9 from bkwalker/master

Initially push to git
fixed merge conflicts with gemfiles
merged dima's pull req with master and resolved merge conflicts
Merge pull request #11 from sdford/modelsBase

Base infrastructure for all models now merged
removed .orig file
Merge branch 'master' of https://github.com/sdford/pocketChange
erroring with factory girls setup and shoulda
did factory setup and finished unit testing for book_details