Various fixes for the last release, Bootstrap 2.0.4 and Font Awesome 2.0