- add sourcetree as merge and diff tool
- add go stuff