Merge pull request #33 from whatupdave/master

Bug fix and refactoring
add some test nicities for Dave :)
Fixed failing controller test

assert_select is probably too brittle at this stage with a lot of html
changing rapidly
skip bundler groups in travis for speedier builds