misc updates
Merge branch 'develop' of https://github.com/sgkit/bootui into develop