Merge branch 'hotfix/rvm'
Merge branch 'develop' of github.com:Erocanti/Vaprobash into develop
Added mailcatcher to scripts