added my old Xdefaults
Merge branch 'master' of github.com:bruvik/dotfiles

* 'master' of github.com:bruvik/dotfiles:
  use inconsolata
  no trailing / in path
  removed stupid autocomplete for defaults. New file, terminal customizations.
set $TERM correctly

also include tmux.conf