james | adding breakpoint
james | moving configs into subdirectory
james | new approach
james | new approach
james | super 'smart'
Merge branch 'config_change' of https://github.com/jacobwagner/monster into config_change

Conflicts:
	config.yaml
	config/config.yaml
	config/pubcloud-neutron.yaml
	config/sat6-ubuntu-neutron.yaml
	config/sat6-ubuntu-novanet.yaml
	configs/default.yaml
	configs/pubcloud-neutron.yaml
	configs/sat6-neutron.yaml
	configs/sat6-novanet.yaml
	monster/config.py
	pubcloud-neutron.yaml
	sat6-ubuntu-neutron.yaml
	sat6-ubuntu-novanet.yaml
Merge pull request #4 from jcourtois/config_change

Config change