Removed broken scripts
Merge remote-tracking branch 'origin/navi' into mike

Catching Mike up with the latest news.
Merge remote-tracking branch 'origin/marvin' into mike

Syncing mike with marvin
Merge remote-tracking branch 'origin/mike'