Move properties into spec file; use p function
Common to use underscore format for property names
revert preemptive template fixes
Merge pull request #1 from drnic/properties

Move properties into spec file; use p function