Still in rough, but removed deprecated content
More integration of @callahad's copy
Merge pull request #7 from ryanfeeley/master

Still in rough, but integrated more of @callahad's copy