Rebase on top of proxygen/lib/services changes - some files were moved from proxygen->folly
Merge pull request #37 from djwatson/master

Rebase on top of proxygen/lib/services changes