Merge pull request #250 from EliAndrewC/fix_undefined_var

undefined var fix
more pycharm stuff
Merge branch 'master' of https://github.com/EliAndrewC/magfest
Merge pull request #254 from EliAndrewC/master

pull latest master into develop