Merge pull request #100 from stateoflux/master

each chart is now rendering their own data sets
it's daaaaanglin
fixes issue where user comparisons were not working after signup
Merge branch 'master' of https://github.com/Fittr/fittr
code cleanup
Merge pull request #101 from sarchila/master

fixes issue where user comparisons were not working after signup
resolving conflicts
final fixes to merge conflicts
Merge branch 'master' of https://github.com/Fittr/fittr into stylin

Conflicts:
	public/templates/topBar.html
Merge pull request #102 from sudostack/stylin

Stylin - it's daaaaaaanglin'
attempted to implement more chart functionality, but run into an interesting bug.  debugging wil ensue.
fixed merge conflicts