replaced removed stylesheet discovery
Fix merge conflicts.
Remove root gemfile and lock.
Whitespace fix.
Merge upstream corona changes.
Merge relavant upstream changes to shared template.
Bump version number and date.
Be more flexible with dependency versions.