Nicholas Irving: updated
* Fixed the calculators to provide the correct values
* Updated the templates
Merge branch 'master' of https://github.com/darkedges/money.darkedges.com

Conflicts:
	app/views/calc/howlong.html