change of name
edits to previous posts and rename rick's blog posts

revised categories to be more meaningful
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
fix ISIS post and CNI category
rename isis contest file
fix space after title on isis post
change of text
isis post not working
Merge branch 'master' into staging

Conflicts:
	databrary/input/posts/2014-07-17_ISIS_conference_winners.md
change title to working title
rename to try and make isis post work
revert category on isis post to events