cleaned up config
Merge branch 'master' of https://github.com/bittome/orderbuddy

Conflicts:
	config.js