Merge pull request #287 from mikeubell/master

Add form 497. fix #288
Remove unitiized money from in Oakland calculation.