Tests passing now
Merge branch 'master' of github.com:heynemann/holmes-api