Theme updates.
THeme updates.
Added jetpack.
Merge branch 'contrib'

Conflicts:
	wp-content/themes/twentytwelve/style.css