Merge remote-tracking branch 'upstream/master'
forgot to escape -> syntax-error
environment is already used by puppet, so lets use env
set puppi run timeout to 900s
parametrising timeout
Merge pull request #1 from MalteJ/puppi-timeout900

Puppi timeout900
Added puppi::runscript define
Merge branch 'master' of https://github.com/example42/puppi
adding support for hybris 5
fixing path in files/scripts/yant.sh
fixing yant.sh path
omitting dir times when rsyncing during deploy
Merge branch 'master' of https://github.com/example42/puppi
adding hybris extensions
fixing
Minor docs changes
Adding get_module_path()
Merge commit 'f758725'
Merge branch 'master' of https://github.com/example42/puppi
Partial Fix for #64