Updated travis file and added tests file.
Merge branch 'gh-pages'