Change the twitter bootstrap url as per #556
fixed merge conflict