Basic Travis-CI config
Add librsync-dev to Travis install
Merge remote-tracking branch 'upstream/master'