Netbook edits.
Merge branch 'master' of https://github.com/modeler/arch-scripts