拿掉neocomplete
change default theme to gallifrey
Merge remote-tracking branch 'upstream/master'