make rpm default config same as deb/tar

Mostly syntax differences, except for (update-index) which is
obsolete now, and therefore removed.
Merge pull request #324 from mfournier/default-rpm-configfile

make rpm default config same as deb/tar
Improved error handling for websocket connections.

Some types of errors would result in dangling closed connections, and a
race condition (ztellman and I think?) in the close process led to
instrumentation throwing during the connection close process. These
changes may improve those behaviors.

Conflicts:
	src/riemann/transport/websockets.clj
Merge branch 'master' of github.com:aphyr/riemann
Websocket transport: Correct argument order for run-pipeline.
websockets: Minor bug fixes

* Removed accidental duplicate of routes.
* Close channel in exception handler.
* :error-handler has to be non-first argument to `run-pipeline`.
Merge pull request #326 from udoprog/master

websockets: Minor bug fixes