Merge branch 'develop'
Resource RVM
Merge pull request #202 from Ilyes512/fix-rvm

Resource RVM
Merge branch 'develop'
Removed xdebug.kdekey setting

This was added in a previous commit by mistake, and later removed - I can only imagine the PR which pulled this back in forked from that earlier, mistaken, commit.
Merge pull request #203 from LimeBlast/patch-1

Removed xdebug.kdekey = "PHPStorm" setting
Merge branch 'develop'
Added sudo add-apt-repository ppa:mapnik/boost
Removed new line at end
Update hhvm.sh
Merge pull request #205 from LimeBlast/patch-2

sudo add-apt-repository ppa:mapnik/boost