update travis config, minor lint fixes

Take 2 for updating travis config and lint cleanup (#29).  Rebased, gemfile updated, travis indenting fixed.  Sorry for the little things there.