Add bash aliases on OS X
Make djtests alias less dir-structure specific.
Add ctags as well as etags.
Installed Heroku Toolbelt on OSX.
Install emacs config on OSX.
Merge branch 'master' of github.com:carljm/dotfiles

* 'master' of github.com:carljm/dotfiles:
  Update to Python 2.7.5.
  Smarter mktags and rmpyc.
  Add warehouse IRC channel autojoin.
  Upgrade to Python 3.3.2.
  Always ignore .tox and MANIFEST files.
  Git-ignore emacs tramp file.
  Add YAML editing mode.

Conflicts:
	gitignore