SmartSync-based plugin updates
Merge pull request #13 from khawkins/smartsync_merge

SmartSync-based plugin updates