Add heroku specific settings
Toggle dev settings to false for heroku
Fix merge conflicts
Merge new changes
Add favicon to page
Add hidden text for bookmarklet; still doesn't look like a good way to set the favicon
Refactor link attaching methods to be a little more clear and helpful
Use 1.x of ZeroClipboard for compatibility reasons
Add onreadystatechange to jquery load for older IE browsers
Add some notes to make FB link work by piggybacking off of their own bookmarklet
Fill in a few holes in the CSS to keep style uniform across browsers
Better error handling for resource loading
Add handler for if user doesn't have Adobe Flash or has an incompatible version
Merge in changes from compatibility branch
Change no/out of date flash warnings for the clipboard functionality to prompts, so user can copy/paste link with Ctrl+C
Change no/out of date flash css, no longer want to strikethrough the copy to clipboard button, since using window.prompt still makes it very usable