Updated the README, added the .travis.yml and contributing.md files and inserted the license headers
Fix merge issues
Merge branch 'svanharmelen-master'