Merge branch 'master' into tox_functionality

Conflicts:
	README.md
	bower_backup/backup.py
	tests/test_bower_backup.py
	tests/test_local_packages.py