Updated the README file to make the ImageMagick dependency more obvious.
Cleaned up the documentation.
Merge pull request #11 from LandonSchropp/master

Updated the README file
Update README.md with correct way to specify options
Merge pull request #15 from gsterndale/master

README update corrects how to specify options
add new format 120x120 and possibly fix ico-problem on windows
Merge branch 'refs/heads/develop'

Conflicts:
	lib/middleman-favicon-maker/version.rb
	middleman-favicon-maker.gemspec
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
some readme fixes
tiny readme fix
Merge branch 'refs/heads/master' into develop