Added db settings
Changed directory for db settings
Merge branch 'master' of github.com:comtesacristain/rdis
Merge branch 'master' of github.com:comtesacristain/rdis
Merge branch 'master' of github.com:comtesacristain/rdis
stupid indents
STUPID INDENTS
Bla
Merge branch 'master' of github.com:comtesacristain/rdis

Conflicts:
	rdis/database.pyc