deleted unit tests
cleaned up specs - rather radically
fixed merge conflicts in schema.rb
Merge pull request #1 from drblinken/master

specs running