fix fileability/ternproxy#1
Merge branch 'master' of github.com:ramitos/tern