Merge pull request #79 from andig/master

Moved bootstrap code into central lib/bootstrap.php