tpbatstat: changed interface to acpi
Fixed merge commit 23bb8a26aec70efffd11d98e4f744b3f5449f186
trying out relative numbering in vim
.vimrc: go back to absolute number as default, but add <C-N> as shortcut to toggle between absolute and relative numbering
.vimrc/.bashrc: Toggle spelling with <C-S>, keep term from interpreting <C-S> as 'stop'
vimrc: fixing gitk confusion?
gitconfig: added aliases
Merge branch 'siduction-merge' of https://github.com/teleshoes/zuserm-home into teleshoes-siduction-merge

Conflicts:
	.bashrc

Did not merge get-on-wifi. Don't have magic that lets me installFromGit without wifi.
gitconfig: added alias for branch
gitconfig: added alias for merge
gitconfig: changed alias r to 'reset HEAD'
gitconfig: added aliases for pull and push
gitconfig: replaced tabs with spaces
gitconfig: more sensible aliases or pull/push
gitconfig: name