updating readme
bring branch up to speed
adding travis badge
merge
merge
test commit
Merge remote-tracking branch 'gs/master'