Merged in Johns physical design changes.
Merge branch 'BananaSlug-watchdog'
Changes for Compas test.