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
Switch from using shell a2enmod to Ansible's 'apache2_module' in Apache role.
tweak a bit travis and fix command self-update
remove else in favor of just return
fix some indentation
fix some docblocks and another return
Merge pull request #65 from cordoval/template-adjustments

fix some indentation
Merge pull request #64 from cordoval/remove-else-because-of-return

remove else in favor of just return
Merge pull request #61 from mxxcon/apache2_module

Switch from using shell: a2enmod to Ansible's 'apache2_module' in Apache role.
Merge pull request #63 from cordoval/tweaks-to-travis

tweak a bit travis and fix command self-update
Merge pull request #60 from Phansible/advanced-options

Added advanced options (Windows, Vagrant cloud and NFS)
Adding the ability to setup a servername for easy access instead of ip only
Merge pull request #68 from mikeSimonson/servername

Adding the ability to setup a servername for easy access instead of ip only