Refactor a bit, add subcommands
Merge branch 'master' of ssh://github.com/wasamasa/dotfiles