Merge pull request #1 from michaelrice/development

Development
Rename fluxStyle to fluxstyle_gui
cleaning up this old mess