Upgraded to Rails 4.1.2 (from Rails 4.1.1).
Added RSpec 3 compat.
added latest oceanfront and cleaned up common.css to adhere to new oceanfront.css
merged upstream and bundle update