Can now handle recursive trees
Added dotfiles executable to PATH
modified m and o commands
Re-added default PS1
Merge branch 'master' of git://github.com/halo/dotfiles

Conflicts:
	dotfiles/bash_profile
force utf-8 in ruby < 2.0.0