Revert "Incorporate all changes from nathan7/master"

This reverts commit 20fd55a0faccfbdb721c79418a9562c90b7fabc2.
Revert "Merge pull request #12 from powtac/patch-1"

This reverts commit 881126861dfce70c25f7edfc037eb8fd17d7c7fc, reversing
changes made to 14413d13f6603b3583f131aadc40c3892479db83.
Revert "Merge pull request #11 from alexrj/patch-1"

This reverts commit 14413d13f6603b3583f131aadc40c3892479db83, reversing
changes made to 902938a8501f7112815e1cf9eac700a09e9aa28a.
Revert "Merge pull request #8 from tonylukasavage/typo"

This reverts commit 902938a8501f7112815e1cf9eac700a09e9aa28a, reversing
changes made to c3bc3c2bddfa2137a2e2a2b57ef030157730c2ba.