Move the base config file up a folder
Add keys, required by RVM 1.2.6+
Merge pull request #151 from rodrigoeg/master

Add keys, required by RVM 1.2.6+
Merge pull request #149 from JasonReading/master

Ignore failure of 'logs | link logs to vagrant folder'
Ignore jetbrains
Use php 5.3 by default for this box config
Merge branch 'base'