Protocol can't have underscores in it
Prevent against crashes due to inserting nils into dictionary literals
Remove unnecessary nil checks, clearer mutable dictionary initialization
Merge pull request #49 from tumblr/literal-nil-crashes

Prevent against crashes due to inserting nils into dictionary literals