Some pep8 and style fixes.
Merge branch 'amatellanes-master'
version bump and merge in contributions from amatellanes