Rename website directory to project, the new convention.

Update to latest deployment scripts.
Merge branch 'master' of github.com:aptivate/generic-website

Conflicts:
	deploy/fabfile.py
	deploy/fablib.py
	deploy/tasklib.py