update action map
Merge branch 'master' of github.com:mcartmell/merlion

* 'master' of github.com:mcartmell/merlion:
  more work on websocket responders
  morning documentation
  error handling

Conflicts:
	lib/merlion/util.rb