Remove interlock as it's not compatible with Rails 3 and is unmaintained
Merge remote-tracking branch 'openaustralia_github/interlock' into develop
Fix typo.
Remove leading space - seems to be causing test failures, although not a problem in app itself.