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 remote-tracking branch 'mzsanford/media_query_support'

Conflicts:
	lib/premailer/adapter/nokogiri.rb
	test/test_misc.rb
Forgotten simplified rules to_s
We need css_parser 1.2.5 or above now.
We need css_parser 1.3.5 or above now.
removed useless returns at the end of methods
css_parser now owned by premailer organization of GitHub.
Ignore .bundle/
we need to test body here.
Merge pull request #164 from amclin/master

Improve command line mode detection for arguments vs. STDIN
Merge pull request #165 from alexyakubenko/master

removed useless returns at the end of methods
Version bump to 1.8.0
Fixed link to v2.0 planning page.
Tiny typo :)
Merge pull request #177 from ricburton/patch-1

Tiny typo :)
Merge branch 'patch-1' of https://github.com/thejase/premailer into thejase-patch-1

Conflicts:
	README.md