merging mikethecanuck/enable-cd with current master to be able to commit the PR
merging mikethecanuck/enable-cd with current master to be able to commit the PR

hackoregon/team-budget,hackoregon/team-budget,jimtyhurst/team-budget,hackoregon/team-budget,jimtyhurst/team-budget,jimtyhurst/team-budget