Update to Manifest v2

http://developer.chrome.com/extensions/manifestVersion.html
Merge branch 'manifest_v2'