Merge with debian conf
Next/prev buffer, gb to block comment, php/css 4 space tabs