Merge branch 'master' of https://github.com/micahwalter/micahwalter.com into wordpress