Dispatch tests?
Stop failing when digispark is not plugged in
Set up automerging of rails schema and Gemfile.lock files

See http://bitfission.com/blog/2010/07/auto-merge-gemfile-lock.html
and http://tbaggery.com/2010/10/24/reduce-your-rails-schema-conflicts.html
OMG look, things changed