Make sure setup script works even when no bootstrap is attempted.
Merge pull request #223 from mfkaptan/master

Minor tweaks in template's setup script
Merge remote-tracking branch 'arskom/master'