some working changes in path etc
modelines are cool
Merge branch 'master' into laptop