Installed ckeditor, commerce_donate modules
Patched commerce_donate to fix issues with checkout pane
Merge branch 'master' of github.com:criticalmash/shakerlakes
Merge branch 'master' of github.com:criticalmash/shakerlakes
Merge remote branch 'origin/dev'
Added annuals data file.
Data import: Added Color column to Annuals.csv.
Added custom module to update "Shipping" to "Delivery" in checkout process.
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

* refs/remotes/origin/dev:
  Data import: Added Color column to Annuals.csv.
Added commerce_donate 7.x-1.x-dev module with patch from issue https://www.drupal.org/node/1986592 #3.
Merge branch 'dev' of github.com:criticalmash/shakerlakes
Added commerce_custom_product module version 7.x-1.0-beta2.
changed settings.php but will remove from cache in next commit
Data import: Added product_references_annuals.csv.
some cleanup - remove settings.php from cache and commerce stuff
Merge branch 'dev' of github.com:criticalmash/shakerlakes into dev
Data import: Removed blank lines from annuals references csv.
added annuals importers
Added diff module version 7.x-3.2.
_annuals: Removed Status from product feeds importer.
updated shakerlakes theme