restores the dot: true on the gruntfile
this file was a stray.. no reason to keep
clears the test file of the merge conflicts
removes metadata that is not valid anymore
puts in a place holder for the spine options

Note we will want to update the doc once this section is soild
replaces the contact block with the format in use.

We will want to doc this section more to highlight that you could have
many contacts and adding a #primary on the block of choice will pull in
that one as the first block
does the same replacement on the sample file

this is the same replacement as the test file.
Merge pull request #22 from jeremyBass/master

correct any of the merge items that failed
Merge branch 'master' into grunt-build

Merges dot:true update from previous PR
Conflicts:
	Gruntfile.js