Reconnect websocket on pageshow event. Fixes #4.
Moved the transition state related data out of code and into config.
Merge branch 'master' of github.com:eikeon/marvin

Conflicts:
	templates/site.html
Changed Marvin's Do to a channel.