Merge branch 'master' of github.com:bolt/bolt

Conflicts:
	app/classes/lib.php
Refactoring config into an Object. Very much a work in progress.