Fix whitespace problem with marginnote
Tweaks to one-col style file.
Removing marginpar. Updating docs
Remove marginpar test
Don't use upquote since inconsolata lacks straight quotes