Merge pull request #88 from jonezy/master

missed fixing this yesterday
Merge pull request #89 from jonezy/master

refactored calculation helpers and added tests
Merge pull request #90 from jonezy/master

various fixes tweaks and updates, moving fast so keep upstream up to date
Merge pull request #91 from jonezy/master

Tests, motherfucker.
Merge pull request #93 from jonezy/master

finished helper refactoring, added controller tests, fixed nav issues.
Merge pull request #94 from jonezy/master

finished fixing main navigation problems