Convert templates from spaces 4 to spaces 2
Merge pull request #147 from jonathanmoore/master

Convert templates from Spaces 4 to Spaces 2.