Conflicts:
	.travis.yml
	pipeline/compilers/__init__.py
	pipeline/compressors/__init__.py
	pipeline/jinja2/ext.py
	pipeline/storage.py
	pipeline/templatetags/compressed.py