setting up for jasmine tests and updating model specs to reflect the new data model
going to use rspec instead
Merge branch 'jasmine_testing_for_js'