bring back mark as read
merge master
Merge branch 'master' of github.com:gabrielecirulli/hn-special into mark-as-read

Conflicts:
	lib/defaults.json
Merge branch 'master' of github.com:gabrielecirulli/hn-special into mark-as-read

Conflicts:
	lib/defaults.json
Squashed commit of the following:

commit 08b779e82715d59497f8fe146af342e80612bb79
Author: Jesse Patching <jesse@patching.ca>
Date:   Thu Oct 3 20:04:36 2013 -0600

    Working implementation of permissions

commit 87be2093df2631cc8803e74a0524ae273908842b
Author: Jesse Patching <jesse@patching.ca>
Date:   Thu Oct 3 18:57:19 2013 -0600

    Updated optional permissions scripts

commit 743e20608b030aa8cd29efa16fc6f9a096475f3f
Merge: 77ef47d 78490f6
Author: Jesse Patching <jesse@patching.ca>
Date:   Thu Oct 3 17:42:18 2013 -0600

    Merge branch 'master' of github.com:gabrielecirulli/hn-special into mark-as-read-iframe-experiment

    Conflicts:
    	lib/defaults.json
    	manifest.json

commit 77ef47ddc343e475f354dcdfc741da16a34fe7f1
Author: Jesse Patching <jesse@patching.ca>
Date:   Mon Aug 12 22:31:26 2013 -0600

    Attempt to use iframe to access chrome.permissions API
Bump version to 1.2.12
Updated hn_theme.css
fix up indentation in permissions page
fix up indentation on permissions script
remove capital p in "Permissions"
make permissions.js check for the right permissions
slightly refactor permissions.js
only add the iframe in certain cases
tweak the styling of the permission iframe
Merge branch 'master' of github.com:gabrielecirulli/hn-special into mark-as-read
Bump version to 1.2.13
replace single quotes with double quotes
make modules turn off if they don't have the right permissions when applied
change small variables and comments
add module name to permissions iframe ID