Correcting github link.
Making things more consistent, changing specs.
Merge pull request #23 from sdmp/master

Updates to templates and actual specs.