FIX: Style testing
Merge pull request #150 from Eric89GXL/fix-flake

FIX: Fix Travis style testing.  Yay!
FIX: Misc fixes
Merge pull request #153 from Eric89GXL/misc-fix

Looks good, tests pass, merging.