remove merges from changelog on website, unclobber config.d
-rw-r--r-- 20 .gitignore
-rw-r--r-- 135 .htaccess
drwxr-xr-x - bin
drwxr-xr-x - pub
drwxr-xr-x - src
drwxr-xr-x - srv