Merge branch 'master' of git://github.com/all9lives/web-base-template into all9lives-master

* 'master' of git://github.com/all9lives/web-base-template:
  Added prerequisites to install
  Directory with AllowOverride to apache conf

Conflicts:
	README.md
(cherry picked from commit ef935a8)

Conflicts:

	README.md

Author: danheberden

README.md

@@ -19,12 +19,12 @@ This install guide assumes you already have certain prerequisites already config
     ServerName local.jquery.com
     ServerAlias *.jquery.com *.jqueryui.com *.jquery.org *.qunitjs.com *.sizzlejs.com *.jquerymobile.com
     DocumentRoot "/srv/www/jquery"
-        <Directory /srv/www/jquery>
-           Options All
-           AllowOverride All
-           Order allow,deny
-           Allow from all
-        </Directory>
+      <Directory /srv/www/jquery>
+         Options All
+         AllowOverride All
+         Order allow,deny
+         Allow from all
+      </Directory>
     </VirtualHost>
     ```