Bump version to 3.6 and updates for changelog (#147)

Patch for release 3.6 (#147)