[feature/apache] working on getting apache to install... not there yet
[feature/apache] almost forgot to add files that were in stash; still doesn't work, though
[feature/apache] merging develop into feature/apache
[feature/apache] base apache install working
[feature/apache] apache working with php now
Merge branch 'feature/apache' into develop