remove config after rsync'ing
Merge branch 'dev'