Merge branch 'skrollr_integration'
Merge branch 'skrollr_integration'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Remove old application.html.erb
Separate public and admin styling and JS
Merge pull request #27 from dhawt/public_layout

Clean up presentation of pages#show