Add new awesome feature X

This is where you can write a book on why this patch should be merged
and how things will be awful if it is not merged.
Merge pull request #3 from ghoneycutt/awesome_new_feature

Add new awesome feature X