doing things
pending failing
Merge pull request #14 from spencerolson/fix_travis

Fix travis