Merging custom changes to YOURLS into master branch

This merges all the changes made to YOURLS into the master branch.