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.
Merge branch 'release/1.2'

Conflicts:
	compressor/filters/css_default.py
Merge branch 'release/1.3'
Ported setup.py to python 3
Fixed possible UnboundLocalError exception
Fixed UnicodeEncodeError in GzipCompressorFileStorage
Initial python 3 compatibility
Python 3 compatible lxml parser. Note that lxml under python 3.3 doesn't handle non-ascii characters correctly at this time.
Added url2pathname function to compat module
Made filters fully aware of source file charset (filename argument). Filters are now fully responsible for decoding data from bytes to string.
Add make target for setting up test environment

This commit replaces the 3 lines from the contributing instructions with
a single make target.  Only a tiny thing, but it's reduces the distance
from zero to tests passing, which can only be a good thing in my book.
Merge remote-tracking branch 'py3/feature/python3' into py3_new
Add travis tests against python3
Fix falke8 errors
More flake8 fixes
In python3 import bs4 not BeautifulSoup which will work only in python2
Fix deprecated warnings and add tox test
Change internall import of six to django.utils.six as we don't need add more dependecies