merge from Twitter:

* Tue Nov 26 2013 - jschauma@twitter.com
- 1.7.2:
-  [SECURITY-10466]: handle keys with options and multiple comments
-  document '-E' in usage
delete unused file; we now build the spec file on the fly