Updating contribute page to email Asana and setup tasks
Fixing a typo in the reg ex for tags
Merge branch 'redirects'
CodeKit process JS magnification not needed
Fixing some redirects and removing old links to blog.makezine.com, also updating the "From" address for Asana task creation
Correcting Syntax error
One. Last. Update. For the contribute form.
I knew I spoke too soon….
Radioshack banner for home page and page 2 link fix
Merge branch 'bolson'

Conflicts:
	page-home.php
Merge branch 'master' of https://github.com/Make-Magazine/makeblog
Menu positions stuff. Still in progress….
Adding google plus link and updating main logo image for maker camp short code
Adding sortable functionality to the affiliate listing on the map page
Merging commits from @bill from branch 'maker-camp'
Merge branch 'maker-camp'
Merge branch 'master' into new-header

Conflicts:
	includes/theme_stuff.php