Merge branch 'master' of github.com:sjsrey/pysal.github.io

Conflicts:
	_includes/index.md
Merge branch 'master' of github.com:pysal/pysal.github.io

Conflicts:
	_includes/index.md
	_includes/news.md
	_includes/upcoming_events.md
	_site/news.html
	_site/upcoming_events.html
Merge pull request #21 from sjsrey/master

updating news