Merged with, removed prefix, added header
Merge branch 'bsdmake' of https://github.com/Tox/toxic into bsdmake