changes for german server
removed junk and added emacs changes
merged usb with german
removed color themes
arch updates
merged home and server files
renamed emacs to init.el. Helps with mode recognition. Also fixed install.sh
removed colors from Xresources on debtower
Merge branch 'master' of /home/adam/dotfiles
fixed various bugs
minor changes
Merge branch 'master' of /home/adam/dotfiles from DebianTower.
added gitignore
conky for i3
Merge branch 'master' of /home/smed/dotfiles from ArchHome
remove tramp
added fortran formatting and enabled IDO mode
modified urxvt colors in Xresources. Minor changes in zshrc and xinitrc
added tramp to gitignore
added ifort support