docstrings
Merge branch 'master' of github.com:ciaran-phillips/emain
Merge branch 'master' of github.com:ciaran-phillips/emain
rory sttings