fixed diamond collectors config (again), fixed django fixtures file to use the context variables
added pillar.example, added sqlite auth support, completed settings support for mysql