Fixing some wiring issues
Merge branch 'master' of github.com:danrspencer/darwin