added simple tests. some other updates
Merge branch 'master' of github.com:boltphp/bolt

Conflicts:
	conf/httpd.conf
	src/bootstrap.php