Bumps version to 0.6.1
Updates changelog for 0.6.1.
Merges branch 'release/0.6.1' into develop