Stuff?
Merge branch 'master' of https://github.com/JesseDunlap/eventd-cs

Conflicts:
	packages/Newtonsoft.Json.5.0.6/lib/net45/Newtonsoft.Json.xml