File output option
Merge branch 'dev' of https://github.com/dropsonic/thesis into dev