merged
Merge branch 'master' of https://github.com/garaemon/emacs.d
change the catkin root