typo
Merge remote-tracking branch 'warddr/master'
add separate testing command for Travis
add travis build status