added -merge to xrdb
moved wmname to bashrc.local, added source
Merge branch 'master' of https://github.com/d4ryus/dotfiles

* 'master' of https://github.com/d4ryus/dotfiles:
  added alias to autoupdate aur packages