Test
Merge branch 'master' of https://github.com/digizent/capistrano-dgz-wp

Conflicts:
	lib/capistrano/tasks/dgzwp.rake