Merge pull request #1 from ITS-UofIowa/test

Test
Merge pull request #2 from ITS-UofIowa/prod

Prod
Remove custom html.tpl.php

This file is trying to include ie.css, which doesn't exist and is breaking the uiowa_bar.