Do not do setup if we are in live and outside nolock.
Merge branch 'master' into debian
Updated gitignore.
Merge branch 'master' into debian
1.0.1-1