Finally switched to pathogen and cleaned up files.