Merge branch 'stanislas-master'
added some integration tests
fixed the thread safety issue with swap! on starting/stopping the server.
improved some tests