Fixing the stuff that got overwriten by merging (again!).
Removing require.. as it's not available during installation.
Fixing Db directory path.
Fixing ColorCLI object not created before use.
Improving error output for web pages.
Restoring require.. but making it conditional so post install stuff can use it.
Fixing a path
Changing require in config.php.tpl into a require_once.
Fixing more paths
Replacing constants
Fixing some more over written stuff.
Adding new uitility method to ensure a path ends with a slash.
Adding checks/input for covers path during install.
Fixing the missing object. oops!
Fixing another path.
Fixing paths to Smarty.
Replacing $this with $cfg.
Replacing more $this with $cfg.