Prepare for 0.4.2
Fix RST errors
Fix typo in link
Simplified conditional
Removed pylint test that no longer seems to exist
Minor code clean-up
Add back pylint directives that were apparently for Travis
Merge remote-tracking branch 'upstream/master'

sync with remote to see if missing import has been fixed