Update .travis.yml
Move travis flake8 and test command to MakeFile
Merge pull request #201 from quamilek/develop

Update .travis.yml
Merge branch 'develop' into minor-layout-fixes