had a tidy up and switched to guard/zeus
add hackety hack for making tests run faster (no GC... ridiculous idea) and tidy up spec_helper in general
new rails version, hooray
Merge branch 'develop'