remove mysql as it errors
fix a merge error
add new config file
add person and project files
moving personal stuff to personal file