removed http_x_forwarded for until a better solution is found.
Merge with upstream
Merge pull request #60 from michele-comitini/master

oauth 2 fixes