Merge branch 'd125q-master'
Added sumatrapdf to list of viewers
Add shiftwidth to modelines
Added a forgotten shellescape