corrected a typo
Updated setup.py to give proper instructions to Travis

Playing around with VIM for nicely formatted commit messages on GitHub

test line

test line

test line

Caribou