added local settings
Merge branch 'master' of git://github.com/jstavel/cdbazar
Merge branch 'master' of git://github.com/jstavel/cdbazar
Merge branch 'master' of git://github.com/jstavel/cdbazar
Merge branch 'master' of git://github.com/jstavel/cdbazar
Merge branch 'master' of git://github.com/jstavel/cdbazar