Fixed false negative response when punching (mainly due to server badness)
Updated gitignore files
Merge branch 'master' into develop