change of name
Change in name
Merge branch 'staging' of https://github.com/databrary/www into staging

Conflicts:
	databrary/input/posts/2014-07-17_ISIS_conference_winners.md
	databrary/input/posts/2014-08-28_October-Databrary-Board-Meeting.md
	databrary/input/posts/2014-10-11_Big-data-in-Psychology.md
	databrary/input/posts/2014-11-21_Databrary-at-Michigan-University.md