Added tabs for advanced usage options
added content-type
Merge branch 'master' of github.com:Phansible/phansible

Conflicts:
	src/Phansible/Controller/BundleController.php
Merge branch 'master' into advanced-options
use vagrant cloud by default, add advanced options
Advanced Options
Fixing tests
Merge pull request #60 from Phansible/advanced-options

Added advanced options (Windows, Vagrant cloud and NFS)