update models
update more models
get rid of error test
Merge branch 'master' of https://github.com/Fittr/fittr into dev
clean up a bit
Merge pull request #117 from Hendrixer/dev

code clean up