Merge branch 'master' into chase-branch
Deleted akismet and added gitignore
Merge branch 'chase-branch'
Merge branch 'master' into rob-branch