re-track phpmyadmin.conf
update gitignore.
uncomment the update command.
forgot to enable php5-mcrypt