comment out sugartest.
Make Sugar load up first.
Merge remote-tracking branch 'origin/master'