Graphical ssh by default
Add sbin to the path, make meld default mergetool for SVN
Configuring vim for ROS sources
Add openscad
Fixing merge conflicts