Updated lots of stuff.
Updated settings.php file in the pkl_acp module
Merge branch 'master' of https://github.com/pchater/pokelect

Branch needs merging because it does?