Clean up vimdc
Update subprojects