t.py init
Merge branch 'master' into fedora-x86-icarus
obnam: ignoring Steam dls
init gvimrc (sigh)
Merge branch 'master' of github.com:spacez320/mydots
vim: mediawiki syntax highlighting (def for pentadactyl)
awesome: init configuration
Merge branch 'master' of github.com:spacez320/mydots
merge fixing obnam conf