minor tweaks to allow compilation.
Merge branch '0.2.x' of https://github.com/meshula/websocketpp into 0.2.x