converting to catking
removed files ending in ~
no longer setting roxterm profiles because it was causing roxterm to crash.
Merge branch 'converting-to-catkin'