Revert "Merge branch 'master' of https://github.com/blabassi/houston"

This reverts commit c3789ea6c5e56daba8f9ceb63cc63ea1592baf2b, reversing
changes made to 50a3ef7541e7e28a4d5223c2be0cdd275f65cd62.