Changed some defaults per Josh and Excel sheet

Made control defaults match documentation
Merge branch 'master' of git://github.com/Novim/pensionapp
Fixed bug in Benefit Multiplier on the javascript side.