Fixed rake travis (now uses tmp dir).
Merge branch 'master' into demo