nothing much, commented/uncommented lines
Merge remote-tracking branch 'origin/master'
set to staging server, added level 2 check for syncdb destroy
Merge remote-tracking branch 'origin/master'