Merge branch 'master' into gui
Really messy but getting there
Further improvements to the interface
Further GUI improvements
Merge pull request #5 from ghodgins/gui

Further improvements to the GUI