adding travis
ignoring virtualenv
Merge branch 'develop' into feature/issue-1-pep8-pass