Adds the specs of 2013/07/21.
Merge branch 'master' into types
Updates the types for the new spec.
Removes some unused types.