initial reimport form captyop3
reorder
merge info from captypo3
Merge branch 'master' of https://github.com/mipmip/capistrano-typo3

Conflicts:
	.gitignore