Merge pull request #417 from bhariharan/master

The big 2.1.0 release
Add Javadoc target to ant script