Merge branch 'hotfix/1.1.2'
reading files with binary mode. this fixes an issue on windows.
fixes issue #189
Merge pull request #190 from davidbrai/master

Read files in binary mode to avoid windows file reading issue.
Add document outling common scenario deployments. Inspired by dioxs original document.
Display the error line on HTMLParser parse errors.
gargoyle ifswitch support
Merge pull request #232 from bartek/deployment-docs

Add document outling common scenario deployments. Inspired by diox
Doc fixes
Merge pull request #263 from jedie/11ae55c90d7c74c060cbe6fe5777cf24838ce74a

Display the error line on HTMLParser parse errors.
Merge branch 'develop' of github.com:jezdez/django_compressor into develop
comment
Moved flake8 call to makefile.
Updated authors list.
Added section to explain how to run the tests locally.
Updated changelog and bumped version.
Merge branch 'release/1.2'

Conflicts:
	compressor/filters/css_default.py
Merge branch 'release/1.2' into develop
Merge pull request #298 from prezi/gargolye_ifswitch_support

gargoyle ifswitch support
Fixed link to Read The Docs as underscores are not allowed in subdomains.
Merge branch 'develop' of github.com:jezdez/django_compressor into develop