check that upstream exists; add prompt to merge
squash warnings; cleanup; fix go scripts
Merge branch 'stable_2.6.x' of github.com:PSAScapstone2014/ChibiOS-RT into stable_2.6.x
fix bug in simulator resets