fanagling with jasmine
resolved merge conflicts
original jasmine tests again running green
third jasmine test running green
nixed capybara for now
merge commit
added a bunch of model tests
validations and associations tested, functionality pending
merge commit
25 running tests, 3 pending
travis ci updates
merge commit
YML syntax fix
Replaces the placeholder database with actual DB name
removes references to coveralls
testing ajax
Merge branch 'master' into more_testing
merge commit
merge commit
Merge branch 'more_testing' of https://github.com/red-admirals-2014/BootTrack into more_testing