Some restructuring in prep for specs
Tests for request spec templating
Some cleanup for a 0.0.1 release