updating gems
merge develop
beginning of bootstrap goodness