Few things

Added some ad hocs but generally adds some nice things, mainly the ability to read from yml files that contain erb