Merge pull request #18 from andreashappe/master

various cleanups
Merge branch 'master' of https://github.com/andreashappe/archistar-smc