Merge pull request #152 from Madoushi90/master

Regex for PDO DSN
PM count
Merge branch 'master' of github.com:shish/shimmie2
count the messages properly, and show them...
comment snippets should link to the specific comment
replace lots of javascript with a little jquery
Merge branch 'master' of github.com:shish/shimmie2
Wordwrapping BEFORE applying bbcode breaks long links
Wordwrapping AFTER breaks the HTML generated by bbcode when using PHP's wordwrap(), better not to hard wordwrap at all and just do it with CSS
Apply word-wrap: break-word; to all body contents to force reallylongunbreakablestrings to be broken per the theme's dimensions rather than the arbitrary 80 characters set by the bbcode extension
Merge pull request #154 from dgz/fix-wordwrap

Fix issue #62: wordwrap in CSS rather than PHP
fix for image pages not loading for danbooru/lite themes
update tags if image already exists
bookmarklet should now play nice with tags that contain +
option to sort taglists alphabetically rather than by tag count
Merge pull request #157 from DakuTree/master

Fixes/Features
if upload_collision_handler is set to 'don't merge tags', then don't merge tags
make bookmarklet.js easier to read
don't overwrite global $user...
javascript/css updates and compression, and add modernizr
html5 boilerplate header