Disabled lockfiles (.#) - too many  conflicts with guard / rsync / other
software monitoring fs.
Enabled upcase-region and downcase-region commands.
Enabled linum-mode in feature-mode.
Merge branch 'master' of github.com:bkon/dotemacs

Conflicts:
        init.el