Merge pull request #2 from txdavidtx/collection_rspec

added collection controllers
more user specs
Merge pull request #3 from txdavidtx/master

Merging ALL