Update ctrlp options.
Add GenerateTagsIncrementally command.
Merge origin/master