changing back the mem settings for the air
Merge branch 'master' into mdodsworth-air
adding leiningen