Local config when working at ixc
Merge branch 'master' into ixc
vim: Removed numbers.vim bundle
Merge branch 'master' into ixc
Merge branch 'master' into ixc

Conflicts:
	profile.osx
vim: apply ixc house formatting to .scss files
ack: ignore Django media CACHE directories when searching
git: Add git template directory with pre-commit hook to catch 'pdb.set_trace()'
vim: improve statusline, removed fugitive info and added syntastic feedback
git: set 'push.default' to 'upstream' to automatically push changes to remove tracked branches
vim: CtrlP only shows MRU files for current working dir
vim: Make jedi-vim less intrusive
Merge branch 'master' into ic
Remove configs specific to my prior IC machine, no longer relevant