Pti hamcrest 1 1

Whlie building on the mac I got ASCII errors during javadog generation.

I also found hamcrest-1.1 leaking in through jbehave.