merge
Merge branch 'master' of https://github.com/Fittr/fittr
fix routes
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
clean up package json
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
merge
Merge branch 'master' of https://github.com/Fittr/fittr
cleanup some more
merge
fix callback fitbit auth, update api to send back a weeks worth of comapre data and no more