Mode cleanups
Merge branch 'develop' of github.com:thecatontheflat/agile-estimation into develop