Closes GH-53.  Also attempted to fix the scrollspy and affix usage with little success