* Move integration tests to Capybara
* Better ORM integration