Merge pull request #138 from macrauder/master

routes.js wrong method reference fixed.
note faye not socketIo
format
format
catch sigkill on windows (sort of) and allow for graceful shutdown
allow for longer test timeout
preProcessor for actions
homogenize proxyClient in actions
WIP: simplify connection proxy
websocket client will reconnect properly
websocket client will reconnect properly
startup timeouts for test and fast clients
merge
reset from bad test
proper client shutdown
allow for longer test bootup times
http clients can no longer chat
cleanup http server
Update faye-redis to v0.1.2
setup for generic server templates