work on setup.py
Merge branch 'setup' into travis