Fix markup

Hi @gwb6psu

This pull request looks large, but most of it just brings in the build tools update from the 2014 branch--the changes to your paper are fairly minor.

Your paper should now build without a problem!