Installed yaml plugin, for better vim indenting
Added timetrap config. Changed todo.txt alias
Merge branch 'master' of github.com:phantomwhale/dotfiles