Merge branch 'master' of https://github.com/potatolondon/assetpipe
Fix up dependencies to actually work (thanks Randy)