*switched DB connection back to being defined in definitions as I think it is easier to explain it to a new user.
*updated definitions.php comments to make it clearer how to establish the db connection
Merge origin/master