fix for mavericks
work with more than one version of osx
Updated gem source.
Renamed sync type to sync_ to avoid Ruby 2.1 item with same name.
Merge remote-tracking branches 'origin/pr/21' and 'origin/pr/23'