Set time to 5
Some changes for Linux
Relative pathes or bare commands only
Aliases for Linux
Merge branch 'master' into maka