thoney/resume — pull request #1 by thoney (2013-10-22 18:16:23+00:00)
Title: Merge unneeded branch

Not sure why this was branched. Merging newer (and proper) content.