Mainly formatting tidy ups to the main module#5

Open

timlinux wants to merge 2 commits intoNathanW2:masterfrom timlinux:master

+188-120

Commits on Mar 9, 2016

Clean up coding conventions for a more pythonic experience. Added runner script for OSX. Note the help dialog causes an error with the current text so I commented out the offending lines.
timlinux
committed
Resolved merge conflicts with nathan's repo and fixed more shadowed vars
timlinux
committed