doc update
Merge branch 'master' of github.com:bertramdev/asset-pipeline