moving things and upgrading things around
improve python3 support
fix jinja tag
test against django 1.5b1
finish compat with python2.x and python3.x
pep8 fixes
Merge branch 'master' into pipeline-next

Conflicts:
	pipeline/compressors/__init__.py
fix syntax
Merge branch 'master' into pipeline-next

Conflicts:
	.travis.yml
	pipeline/compilers/__init__.py
	pipeline/compressors/__init__.py
	pipeline/jinja2/ext.py
	pipeline/storage.py
	pipeline/templatetags/compressed.py
Merge branch 'master' into pipeline-next

Conflicts:
	pipeline/conf/settings.py
prepare version
continue working on this
use git repository for Django 1.5
Merge branch 'pipeline-next'

Conflicts:
	docs/conf.py
	setup.py
fix glob tests
remove pypy from build temporarely
fix env declaration
fix default settings. close #169
fix default settings. close #169
bump version