upansible
Merge branch 'master' of github.com:srvg/dotfiles

Conflicts:
	.bashrc

	modified:   .bashrc
	new file:   bin/file-encoding
	new file:   bin/git-svn-relocate
	new file:   bin/usbreset
	new file:   bin/usbreset.c
	new file:   bin/usbreset.sh