Allow user-defined aliases for cookiecutters
Unify the terms alias and prefix as one term, abbreviation
Update changelog and authors
Fix @trustrachel's link
Merge pull request #290 from michaeljoseph/more-changelog-and-authors

Update changelog and authors
Add tox to check the PEP8 + Fix current code PEP8.
@merwok review.
@michaelJoseph review.
Fix VCS.
Update travis to use tox instead.
Fix travis test on tox.
Merge pull request #270 from pfmoore/aliases

Allow user-defined aliases for cookiecutters
Merge pull request #282 from Natim/add_pep8_checks

Add tox to check the PEP8 + Fix current code PEP8.
Merge branch 'master' into jinja-hooks

Conflicts:
	cookiecutter/hooks.py