Some minor tweaks
Merge branch 'master' of https://github.com/jamlamberti/hp2014