updated travis
Merge remote-tracking branch 'upstream/master'
removed bad files, cleaned up clf a bit
Merge pull request #12 from c4ssio/master

cleanup