Merge changes proposed by @siffiejoe in #172.
(Sorry about the clumsiness of not doing a proper merge.)
Merge branch 'master' of github.com:keplerproject/luarocks