Add more ido/ggtags stuff
Merge up
Merge up