Support std::pair

Not sure if this is the best implementation, but this pull request adds support for std::pair.  My Emacs config also went and trimmed extra whitespace from the ends of lines.