Thien: Upgrade to bootstrap 3.3.1, using erb instead of haml