added git credential helper for os x
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
use ag on ctrlp and ignore angular tag errors
Merge branch 'master' into osx
Merge branch 'master' into osx

Conflicts:
	vimrc
Merge branch 'master' into osx
start ctrlp in file mode
Merge branch 'master' into osx
Merge branch 'master' into osx
fixed typo
Merge branch 'master' into osx