"Merge" branch desktop into master
laptop specific files
more machine specific files
added irssi config
reworded readme
reworded readme
removed unnec. git aliases
updated webpages
renamed wifi module
better bspace bookmark
general updates
added touchpad-toggle keybind
misc changes
misc changes
moved all git aliases to .git config
added .gitconfig
added vim bookmarks
unified .gitconfig
added color by default for git
updated zshrc