Add travis integration
Add Travis build status image
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore