updates 30/11/14
merged conflicts ubuntu>macair
added mac.md
added ssh instructions