Merge branch 'master' into feature/article
Merge branch 'feature/article' of github.com:csswizardry/csswizardry.github.com into feature/article
Reword around htaccess