Clean up the setup.py to try and fix issue with plugin install
Merge remote-tracking branch 'origin/master'