updated excludes, do not want to track phpmyadmin
Merge branch 'master' into production