Moved circus ini to config
Merge with master