Merge branch 'hotfix/rvm'
Hostname in  vagrantfile
PHP5-FPM Support For Apache

Add support for php5-fpm for Apache by replacing mod-php5 with mod-fastcgi and make php5-fpm as the default PHP install.
Merge branch 'develop' of github.com:Erocanti/Vaprobash into develop
Added mailcatcher to scripts
Merge pull request #93 from Erocanti/develop

Adding mail catcher install
Merge pull request #91 from arector/feature/php5-fpm

PHP5-FPM Support For Apache
Merge pull request #88 from Jaspur/master

Hostname in  vagrantfile
Merge branch 'develop'

PHP5-FPM for nginx and Apache
MailCatcher
Global Composer packages installable via Vagrantfile Config
Global node package installable via Vagrantfile Config
Supervisord
Fixed #95
Merge pull request #96 from Jaspur/master

Fixed #95
Merge branch 'master' into develop