update bootstrap 2.3.2
merge local changes
move tzinfo as development dep