remove excess trailing comma in Gruntfile

from commit: b4fcb7f585f7ea6c64e1a7b889977f05ab3b05c7
inlined ng-includes on page layout
restore outside margins to page
match HTML styleguide
Merge branch 'inline-extra-includes' of https://github.com/lightergrey/VotingInfoApp

This has several commits to tidy things up a bit:

remove excess trailing comma in Gruntfile (Navid caught my mistake here:
b4fcb7f.) restore outside margins to page (I commented this out to test that
Grunt was working and forgot to uncomment it). I updated the HTML to match the
HTML Styleguide The more significant commit is the one where I inlined the
includes, header.html, pageHeader.html and footer.html, from index.html in order
to save us a few http requests. We're including those on every page anyway, so
it seemed to make sense to just inline them in the main layout. The only parts
right now — and that could change depending on Rob's design — that are dynamic
are .main-nav and .auth, are for authenticated users.

Conflicts:
	public/app/common/header.html
	public/index.html