Multiple wm option for startx

- dwm is default
- cinnamon with 'startx ~/.xinitrc cinnamon'
- unity (sigh!!) with 'startx ~/.xinitrc gnome'
added dvcs merge related files to be ignored in NERDTree
Merge branch 'master' of github.com:kra3/dot_files