Merge pull request #1 from idiomatic/master

Add makefile, simplifying build instructions
Merge remote-tracking branch 'upstream/master' into bundled