add support for github's git.io
fix merge conflict
clean up code
increment version
Merge branch 'stupidgithub'

Conflicts:
	README.md
add some comments around
missing escape slash for apostraphe