Added jr-apache, removed drush because it was causing problems, updated jr-php to get php 5.4