.
Merge remote-tracking branch 'nytlabs/master'

Conflicts:
	synchronizer/synchronizer.go
Merge pull request #13 from nikhan/master

merge