Misc updates preparing for Git addition.
Merge branch 'master' of https://github.com/camfitz/spark