various edits (lack of committing fail lulz)
Merge branch 'master' of https://github.com/mtanton/mysite