Merge pull request #26 from plondon/master

move files to main directory for travis configuration