Rfc compliance

@johnwunder @bworrell 
This branch adds support for RFC 2119 terms