Merge branch 'master' into release
Updated CHANGELOG with 3.1.1
Added paths.in
Updated man page
Updated README
Tagged release 2.0
Tagged 1.1.1 release
Tagged release-1.1
- Propagated last minute fixes to release tag