Bumping version for new release
Using a max line length of 120
Merging in the various pull requests from master