Various fixes to models and tests so all tests pass. Move two tests to wip that need substantial work.
Oops. Actually remove tests that were moved.
Merge pull request #163 from jrogelstad/master

Fixes to pass all vows test.