Add some shortcode features; update Font Awesome to 3.1