Updating to latest ol3 master and Bootstrap 3.1.1