Beginning stages of the versatile export tool
Merge branch 'master' into export-tools
Reworked the export tool. Ready to start tweaking and making more robust
Still working away on the export tools.
Merge branch 'master' into export-tools
Ready to beta test the new Reports Generator
Opening up the Maker post type, and adding the meta box to the bottom of it.
Merge branch 'master' of https://github.com/Make-Magazine/makerfaire
Opening up the Maker post type, and adding the meta box to the bottom of it.
Update to main footer ad for magazine and tweak to newsletter signup area
Merge branch 'bolson'
updated to Kate's spec. One more tweak to make.
Polished off the new Reports generator.
Merge branch 'export-tools'

Conflicts:
	plugins/maker-faire-forms/maker-faire-forms.php
Adding cancelled to the list of filters
SVN UP results from @betzster
Correcting some titles in the new reports area
Adding these because @whyisjake is incapable of doing so.
current status.
Good golly, molly. Start, and middle of the new sidebar...