Changes to db for Over,Under local setup
add solr data to gitignore
fix gitignore
changes to CSS and other files
edit gitignore for design
Merge Over,Under
Add sqlite3 to gemfile for convenience of designer
Merge from design
Fix database conflict
So many things. Dry up S3 config, improve partials
Add more solr to gitignore
Get our friendly D3 visualization up and running - see Sustainable Growth page. Uses bracket syntax to truncate the path, at the moment: this WILL NOT work in production and it's quite frankly a problem that it's there.
Merge from develop