Merge pull request #58 from aselbie/master

File cleanup
(test) Travis setup