Cleanup failing tests (re-enable shorthand CSS, Allow unmerged rules like :hover in the <style> but not inline). Build on css_parser support for media queries in the <style> tag.
Add a test for unmerged media queries in the <style> tag
Merge branch 'media_query_support' of https://github.com/mzsanford/premailer

Conflicts:
	lib/premailer/adapter/nokogiri.rb
	test/test_misc.rb