Updated so linenos are tables
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_posts/2014-10-31-angular-js-watch-between-controllers.markdown