Updated to my branch instead of Kevins
Merge branch 'abc' of github.com:timodwhit/drupal-lamp into ABC