over paranoid
trailing spaces removal
reuse inc_bot_block.conf
un-reuse: root path/to/
reuse inc_php_fpm_sock
rename conf files with an conf extension so they will be in the right mode for emacs
Merge remote-tracking branch 'origin/master'