Adding requirements for Travis
PEP8
Updates
Merge fixes
PEP8, Test fixes