Bugfix and tweaks

This brings master up to speed on the deployed version on heroku with various tweaks.
In addition this fixes jplusplus/okf-spending-stories#67