Updated to higher res icon as provided by Ariel
Fixed fialog name for script dialog
Resolved merge conflicts and Added helper for those fine fellas running OSX to be able to use the makefile easily
PEP8