Merge branch 'loadmods'
Merge branch 'master' of heroku.com:cippcalc