Revert "Revert all changes to see if travis just doesn't like me."

This reverts commit eb5991ccd0686d15615bff3a730a641889063943.
2 files changed