Switch to rspec
Tidy
First pass at heroku app model