Fixed up (and tested the local install instructions). Also some indentation
fixes that were causing me trouble.