adding git upm (for fetch/merge upstream/master to current) -- and splitting git shortcuts into most and least used groups