Refactored and simplified the CI scripts a bit to simplify the environment set up steps needed to get going.