Change names of color variables
Revert bootstrap-sass gem down to still use Bootstrap 2 due to issues, but keep the variable names used in the app to the same convention as Bootstrap 3