Add &ts setting and comment regarding .local.vimrc usage
Merge branch 'local.vimrc' into develop

Ref #314