add new format 120x120 and possibly fix ico-problem on windows
Update README.md with correct way to specify options
upgrade favicon_maker dependency
Merge branch 'refs/heads/develop'

Conflicts:
	lib/middleman-favicon-maker/version.rb
	middleman-favicon-maker.gemspec