Added Travis.
fixed typo thanks to stuntguy3000
Merge remote-tracking branch 'upstream/master'