Fix smoketests
Merge pull request #13 from ninja-cat/release/fred/master

Fix smoketests
Convert routines over to new database methods
Merge pull request #24 from galthaus/pull-req-release-rails3anddb-master-f0577cfb61

Switch over to new objects compute nodes almost work rename needs some help [2/29]
Merge branch 'master' into release/rails3anddb/master
Merge pull request #25 from galthaus/pull-req-release-rails3anddb-master-e72ebce263

Merge development into rails3anddb [1/12]