fixes setup to point at correct files + install reqs
Merge branch 'hotfix/fix-setup'
Merge tag 'fix-setup' into develop

fixes setup.py