Use duration for convert basals if available.
Parsers are better, don't delete "duplicates" anymore
New tideline
0.0.33
we no longer use _id for tideline
0.0.34
Merge branch 'master' into kjq/metrics2

Conflicts:
	bower.json