conf.js not included in Makefile any more. resolves #4
Merge branch 'issue-4' into devel