Template inheritance
Merge branch 'master' into deckofpandas
Path merge hackery
Things that work yay
Merge branch 'deckofpandas' into HEAD