Merge branch 'master' into ubuntu

Conflicts:
	README.rst
	deploytool/tasks/provision.py
	deploytool/utils/instance.py
	deploytool/utils/source.py
Force UTF-8 for database creation instead of relying on default server settings
Updated compass compile function. Compile with the compass version given in the fabfile.
Updated version to 0.6.1.
Moved license.rst to LICENSE.rst
Merge branch 'master' into ubuntu

Conflicts:
	deploytool/templates/provision_db_sql.txt
Merge branch 'ubuntu' into nginx

Conflicts:
	deploytool/tasks/provision.py