some minor fixes
Merge branch 'bootstrap' of github.com:catarse/catarse into bootstrap
Merge branch 'bootstrap' of github.com:catarse/catarse into bootstrap
removed commented out lines