add email address and enviroment variables
change the themes to tangotango
fix .gitignore for mac
first merge with HEAD