Reconcile dependencies... weird
Fix a couple of errors that got in the last build. Bump version.

Fixes #1.
Merge branch 'master' of https://github.com/woodbridge/carrierwave-docsplit