Example actually tests something!
Merge remote-tracking branch 'origin/master'

Conflicts:
	java/test/com/natpryce/pearlfish/example/BasicArithmeticExample.java
Merge branch 'master' of github.com:npryce/pearlfish
Updating libraries
Splitting out the markdown specific stuff from templated approvals, layout tables in pipe-table format -- no runtime dependency on Pandoc.