Added Apache module
Updated gitignore
Merge branch 'base' into lamp