Changes for virtualenv. Also cleaned up aliases file.