restructure requirements files
update travis config to use correct requirements file
Merge pull request #20 from webkom/requirements

restructure requirements files