Blogs are in the taxonomy config file.
Created supporting functions for blog to taxonomy conversion.
Navbar on blog index page links to category pages.
Camayak embed convert and Soundcloud tag refactor
Use youtube id instead of url in embed tag
Embed tag admin interface
Newsletter update working
Newsletter header changes correctly
clean up newsletter admin interface
Use Instagram id for embed tag instead of full url
Added Twitter embed tag admin view
Reverted schema.rb.
Merge branch 'master' into newsletter2

Conflicts:
	app/views/newsletter/daily.html.haml
Refactored newsletter. Newsletter ad config in sitevars.
Bumped Gibbon version and fixed a couple of things.
Merge branch 'master' into embed-tags

Conflicts:
	app/models/post.rb
	app/models/post/embedded_media/instagram_tag.rb
	app/views/admin/partials/_header.html.haml
	vendor/assets/bower.json
Converted Post#body_text to EmbeddedMedia.remove
Merge branch 'master' into taxonomy

Conflicts:
	app/models/article.rb
	app/models/post.rb
	app/views/site/partials/_navigation.html.haml
	config/routes.rb
	lib/tasks/sample-data.rake
Don't make oembed call to render tweet
Taxonomy terms can come in different trees. Updated specs.