Added Travis
Merge branch 'master' of https://github.com/mlantz/sid

Conflicts:
	assets/js/jscript.js