Lined up the Nav drop down menu with the Nav headings along the left side.
Removing the extra loaded bootstrap JS file...  :/
Modal shortcode
Optimizebot.
Dropping hte wp_kses, and changing how the embed can work for Ustream/Fora.tv videos.
Merge branch 'develop'
Using the wpcom_vip_is_valid_domain() function to check the embeds.
Using the wpcom_vip_is_valid_domain() to whitelist the valid domains.
Added copyright footer info
Merge branch 'master' of https://github.com/Make-Magazine/makerfaire

# By Jake Spurlock (4) and Bill Olson (1)
# Via Jake Spurlock
* 'master' of https://github.com/Make-Magazine/makerfaire:
  Using the wpcom_vip_is_valid_domain() to whitelist the valid domains.
  Using the wpcom_vip_is_valid_domain() function to check the embeds.
  Dropping hte wp_kses, and changing how the embed can work for Ustream/Fora.tv videos.
  Optimizebot.
  Modal shortcode
Added links to MZ, MM, and MF in the footer
Uncompressing the style.css
Adds a no index meta tag for maker pages.
Added google analytics tracking of 404 events
Redesigned the Newsletter thank you page at /newsletter/thanks-for-signing-up/. To test the page first ad this body https://gist.github.com/davidbbe/7609379 into the WordPress page with template “wide template”

Not sure about about the codekit-config.json file…
Updating Maker Faire Exhibit forms. Starting prep for Bay Area 2014!
Updating the “receipt of application” messages.
Adding a variable for easier faire name changes.
fixing duplicate twitter and previous links showing in admin area
Globally updating all fields to use the current faire variable.
Updating current faire variable to Bay Area 2014
Fixing and prepping some areas to handle old and new faires.
Merge branch 'develop' into gigya-new

Conflicts:
	css/style.css
	header.php
	plugins/maker-faire-forms/maker-faire-forms.php