added documentation for extending asset pipeline
version conflict
fixing url mapping report
Reworking directives documentation and putting the directive types in a table
Merge pull request #44 from craigburke/directives-doc

Reworking directives documentation and putting the directive types in a table
added encoding directive support
caught last minute issue with the encoding directive
whoops, had a bug there for encoding
updating docs to account for encoding