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.
Fix PEP8 errors reported by the new flake8 version (except E128, which we ignore for the time being)
Merge pull request #287 from diox/new_flake8_version

Fix PEP8 errors reported by the new flake8 version (except E128)
Updated changelog for v1.2
Merge pull request #292 from rasca/develop

Updated changelog for v1.2
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