Remove travis badge
Add test instructions
Add tests
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore