comment changes only
cleanup
renumbered due to bug shuffling
added test case for tokenization of macro_rules
auto merge of #9481 : jbclements/rust/minor-cleanup, r=cmr

Small stuff... might as well get it into the tree. One new test case, some issue # cleanup, remove some unused imports.