make clean now cleans up all of the object files
add websocket tunnelling support
bump version
Merge branch 'master' into osx