Cleaned up some of the too-long lines and removed appropriate noqa's
Merge pull request #10 from mpath/long_line_cleanup

Long line cleanup