Various changes.
Merge branch 'master' of git://github.com/chasm/bcad