fixing setuptools install issue
Merge pull request #1395 from naylor-b/installer

fixing setuptools install issue
Merge branch 'dev' into gui