Add 'dif' git alias. Add go paths
merge with master