Add Trevor King's wking/dotfiles-framework
Merge branch 'wking' of https://github.com/wking/dotfiles.github.com into wking-wking

Conflicts:
	content/index.md
Merge branch 'wking-wking' into source
Merge pull request #58 from unixorn/source

I broke #57 when I was merging this morning