fix makefile and typos
Merge branch 'master' of https://github.com/NWilson/oidrelay