Fix for Non-default permalinks

Non-default permalinks returned 404 with these lines being commented out.
Merge pull request #30 from sscotth/master

Fix for Non-default permalinks
Default to not using geolocation/redirector for apt mirrors.
Update phpmyadmin version to 4.1.5
phpMyAdmin autoupdate to the newest version
Automatic SERVER_IP recognition
Merge pull request #31 from rindeal/master

phpMyAdmin autoupdate to the newest version
add git support
echo git path
fix git path with user
set permission on git folder
Merge pull request #32 from maiis/git

Using Git to manage web sites
Add: use browser caching

Fix #35
Update options.conf

Removed automatic IP address detection as ipecho.net is currently down.

Fixed typo on option to enable Git.
Merge pull request #38 from rhonk/patch-2

Update options.conf
Merge pull request #36 from matrixik/master

Add: use browser caching
Reduce nginx caching duration. Set git default to "no".
Change fastcgi_pass value of domain configuration files to match the listen directive of $php_fpm_conf
- Resolves 502 Bad Gateway error with PHP 5.5.12
Merge pull request #1 from betweenbrain/resolve-php-5-5-12-502-error

Resolve php 5 5 12 502 error
Sync with upstream master