Add conda to .profile
Merge branch 'dell' of github.com:asmeurer/dotfiles into dell