Moved tests, modified environment to match.
Merge branch 'master' into testdir
Updated .travis.yml
Moved behave tests to behave subdirectory
Merge pull request #14 from bas-rustenburg/testdir

Moved features to tests, modified environment to match.