people links

2015-12-05 18:44:51 -05:00 · 2015-12-05 18:44:51 -05:00 · 83102dad40
parent ab0535e42f
commit 83102dad40
33 changed files with 1048 additions and 96 deletions
--- a/build.js
+++ b/build.js
@ -15,15 +15,18 @@ var linkchecker = require('metalsmith-broken-link-checker');
 var rootpath = require('metalsmith-rootpath');
 var collections = require('metalsmith-collections');
 var filenamedate = require('metalsmith-date-in-filename');
-
+var registerHelpers = require('metalsmith-register-helpers');
+var match = require('multimatch');

 /**
 * Helpers
 */

-// generate metadata for publications (used in /publications.md)
+// generate metadata for lab membership (used in buildPubs, buildGrants, and /people/index.md)
+var buildMembers = require('./stages/build-members.js')
+// generate metadata for publications (used in /papers/index.md)
 var buildPubs = require('./stages/build-pubs.js');
-// generate metadata for grants (used in /grants.md)
+// generate metadata for grants (used in /grants/index.md)
 var buildGrants = require('./stages/build-grants.js');
 // use mathjax to render inline-latex
 var renderTeX = require('./stages/render-tex.js');
@ -37,6 +40,9 @@ var metalsmith = Metalsmith(__dirname)
  .destination('./site')
 // Disable posting of drafts
  .use(drafts())
+  .use(registerHelpers({
+    directory: "./helpers"
+  }))
 // Generate Cache-Busted CSS files
  .use(fingerprint({ 
    pattern: 'css/*.css' 
@ -49,6 +55,7 @@ var metalsmith = Metalsmith(__dirname)
    altPubs: "metadata/publications.json",
  }))
 // Helper Stage: Render Publication/Grant Details (required for inline rendering)
+  .use(buildMembers())
  .use(buildPubs())
  .use(buildGrants())
 // Extract Path to Root (required for inline rendering)
@ -89,6 +96,14 @@ var metalsmith = Metalsmith(__dirname)
      default: "article.hbs"
    }))
  )
+// Render Lab Member Metadata
+  .use(branch(['people/*.html', '!**/index.html'])
+    .use(layouts({
+      engine: "handlebars",
+      default: "member.hbs"
+    }))
+  )
+// Final Render Pass
  .use(branch('news/**/*.html')
    .use(layouts({
      engine: "handlebars",
--- a/helpers/list.js
+++ b/helpers/list.js
@ -0,0 +1 @@
+module.exports = function(l){ return l.join(", ") }
--- a/helpers/number.js
+++ b/helpers/number.js
@ -0,0 +1,8 @@
+module.exports = function(num){ 
+  num = "" + num;
+  var rgx = /(\d+)(\d{3})/;
+  while (rgx.test(num)) {
+    num = num.replace(rgx, '$1' + ',' + '$2');
+  }
+  return num
+}
--- a/layouts/default.hbs
+++ b/layouts/default.hbs
@ -23,10 +23,10 @@
  </div>

  <div class="header_menu">
-    <li class="first"><a href="{{{rootPath}}}people.html">People</a></li>
+    <li class="first"><a href="{{{rootPath}}}people/index.html">People</a></li>
    <li><a href="{{{rootPath}}}research/index.html">Projects</a></li>
    <li><a href="{{{rootPath}}}teaching/index.html">Teaching</a></li>
-    <li><a href="{{{rootPath}}}pubs.html">Publications</a></li>
+    <li><a href="{{{rootPath}}}papers/index.html">Publications</a></li>
    <li><a href="{{{rootPath}}}grants/index.html">Funding</a></li>
    <li><a href="http://gitlab.odin.cse.buffalo.edu/odin-lab/documentation/wikis/home">Wiki</a></li>
  </div>
--- a/layouts/member.hbs
+++ b/layouts/member.hbs
@ -0,0 +1,22 @@
+<div class="person">
+{{#if pic}}
+	<img class="photo" src="{{pic}}" width="{{pic_w}}" height="{{pic_h}}" />
+{{/if}}
+<h1>{{details.name}}</h1>
+<div class=links>
+{{#if github}}<a href="http://github.com/{{github}}">GitHub</a>{{/if}}
+{{#if twitter}}<a href="http://twitter.com/{{twitter}}">Twitter</a>{{/if}}
+{{#if cv}}<a href="{{cv}}">CV</a>{{/if}}
+</div>
+{{{contents}}}
+<h2>Publications</h2>
+<div class="paper_list">
+{{#each details.pubs}}
+<li><div class="title">{{title}}</div>
+    <div class="authors">{{{list authors}}}</div>
+	<div class="metadata"><span class="venue">{{venue}}</span> 
+						  <span class="resources">{{{resourcesFormat}}}</span></div>
+     </li>
+{{/each}}
+</div>
+</div>
--- a/lib/format-author.js
+++ b/lib/format-author.js
@ -3,9 +3,9 @@ module.exports = format;
 function format(lab){
 	return function(author) {
 		if(lab.findIndex(function(member, idx, ignore) { return author == member }) >= 0) {
-		  return "<span class='lab_member'>"+author.replace(/ /, "&nbsp;")+"</span>"
+		  return "<span class='lab_member'>"+author.replace(/ /g, "&nbsp;")+"</span>"
 		} else {
-		  return author.replace(/ /, "&nbsp;")
+		  return author.replace(/ /g, "&nbsp;")
 		}
 	}
 }
--- a/lib/link-name.js
+++ b/lib/link-name.js
@ -0,0 +1,10 @@
+module.exports = function(name, ext){
+	if(ext == null){ ext = ".html" }
+	return ("people/"+
+		name.
+		replace(/ /g, "_").
+		replace(/ò/g, "o").
+		toLowerCase()
+		+ ext
+	)
+}
--- a/node_modules/metalsmith-register-helpers/.npmignore
+++ b/node_modules/metalsmith-register-helpers/.npmignore
@ -0,0 +1,5 @@
+bower_components
+node_modules
+*.log
+.DS_Store
+bundle.js
--- a/node_modules/metalsmith-register-helpers/LICENSE.md
+++ b/node_modules/metalsmith-register-helpers/LICENSE.md
@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright © 2015 [Kenneth Ormandy](http://kennethormandy.com)<br/>
+Copyright © 2015 [Lin Clark](http://lin-clark.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
--- a/node_modules/metalsmith-register-helpers/README.md
+++ b/node_modules/metalsmith-register-helpers/README.md
@ -0,0 +1,85 @@
+# metalsmith-register-helpers
+
+A Metalsmith plugin for registering Handlebars helpers.
+
+## CLI Usage
+
+Install via npm and then add the `metalsmith-register-partials` key to your `metalsmith.json` plugins, like so:
+
+```
+{
+  "plugins": {
+    "metalsmith-register-helpers": {
+      "directory": "path/to/helpers"
+    }
+  }
+}
+```
+
+This will register all helpers in the specified directory, and use the first part of the filename as the helper name. As a simple (and admittedly contrived) example, you could add a helper that wraps everything in `<strong>` tags, stored in the file `strong.js`:
+
+```js
+module.exports = function (content) {
+  return '<strong>' + content + '</strong>'
+}
+```
+
+And then access it in your templates:
+
+```html
+<pre><code>{{ strong myJSONMetadata }}</code></pre>
+```
+
+## Adding Handlebars Helpers
+
+There are lots of helpers you could try this with in the [Handlebars Helpers](https://github.com/assemble/handlebars-helpers) library. For example, add the `capitalizeFirst` helper into `helpers/ellipsis.js`:
+
+```js
+/**
+ * capitalizeFirst.js
+ * http://git.io/vUJU2
+ */
+
+module.exports = function (str) {
+  if (str && typeof str === "string") {
+    return str.charAt(0).toUpperCase() + str.slice(1)
+  }
+}
+```
+
+Now, you can access it in your templates:
+
+```html
+<h1>{{ capitalizeFirst "the lost typo devision." }}</h1>
+```
+
+## Adding `devDependencies` as helpers
+
+If you’d prefer, this is another way to include helpers installed as `dependencies` in your `package.json` file into your Metalsmith project. For example, you can install the [Moment Handlebars helper](https://www.npmjs.com/package/helper-moment):
+
+```sh
+npm install --save helper-moment
+```
+
+Then, add it as a helper in `_helpers/moment.js`:
+
+```js
+var helperMoment = require('helper-moment');
+
+module.exports = function (str, pattern){
+  return helperMoment(str, pattern)
+}
+```
+
+You can now access it in your template:
+
+```html
+<time date-time="{{ date }}">{{ moment date format="MMMM Do, YYYY"}}</time>
+```
+
+## License
+
+[The MIT License (MIT)](LICENSE.md)
+
+Copyright © 2015 [Kenneth Ormandy](http://kennethormandy.com)<br/>
+Copyright © 2015 [Lin Clark](http://lin-clark.com/)
--- a/node_modules/metalsmith-register-helpers/index.js
+++ b/node_modules/metalsmith-register-helpers/index.js
@ -0,0 +1,26 @@
+var extend = require('extend')
+var fs = require('fs')
+var Handlebars = require('handlebars')
+
+module.exports = plugin
+
+function plugin (options) {
+  options = extend({
+    directory: 'helpers'
+  }, options || {})
+
+  return function (files, metalsmith, done) {
+    fs.readdir(metalsmith.path(options.directory), function (err, files) {
+      if (err) throw err
+
+      files.forEach(function (file) {
+        var templateName = file.split('.').shift()
+        var path = metalsmith.path(options.directory, file)
+        var helperContents = require(path)
+        Handlebars.registerHelper(templateName, helperContents)
+      })
+
+      done()
+    })
+  }
+}
--- a/node_modules/metalsmith-register-helpers/node_modules/extend/.jscs.json
+++ b/node_modules/metalsmith-register-helpers/node_modules/extend/.jscs.json
@ -0,0 +1,68 @@
+{
+	"additionalRules": [],
+
+	"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
+
+	"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"],
+
+	"disallowSpaceAfterKeywords": [],
+
+	"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningRoundBrace": true, "beforeOpeningCurlyBrace": true },
+	"requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
+	"disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
+	"requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
+	"disallowSpacesInFunctionDeclaration": { "beforeOpeningRoundBrace": true },
+
+	"requireSpaceBetweenArguments": true,
+
+	"disallowSpacesInsideParentheses": true,
+
+	"disallowSpacesInsideArrayBrackets": true,
+
+	"disallowQuotedKeysInObjects": "allButReserved",
+
+	"disallowSpaceAfterObjectKeys": true,
+
+	"requireCommaBeforeLineBreak": true,
+
+	"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+	"requireSpaceAfterPrefixUnaryOperators": [],
+
+	"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+	"requireSpaceBeforePostfixUnaryOperators": [],
+
+	"disallowSpaceBeforeBinaryOperators": [],
+	"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
+
+	"requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
+	"disallowSpaceAfterBinaryOperators": [],
+
+	"disallowImplicitTypeConversion": ["binary", "string"],
+
+	"disallowKeywords": ["with", "eval"],
+
+	"requireKeywordsOnNewLine": [],
+	"disallowKeywordsOnNewLine": ["else"],
+
+	"requireLineFeedAtFileEnd": true,
+
+	"disallowTrailingWhitespace": true,
+
+	"disallowTrailingComma": true,
+
+	"excludeFiles": ["node_modules/**", "vendor/**"],
+
+	"disallowMultipleLineStrings": true,
+
+	"requireDotNotation": true,
+
+	"requireParenthesesAroundIIFE": true,
+
+	"validateLineBreaks": "LF",
+
+	"validateQuoteMarks": {
+		"escape": true,
+		"mark": "'"
+	}
+}
+
--- a/node_modules/metalsmith-register-helpers/node_modules/extend/.npmignore
+++ b/node_modules/metalsmith-register-helpers/node_modules/extend/.npmignore
@ -0,0 +1 @@
+test
--- a/node_modules/metalsmith-register-helpers/node_modules/extend/.travis.yml
+++ b/node_modules/metalsmith-register-helpers/node_modules/extend/.travis.yml
@ -0,0 +1,36 @@
+language: node_js
+node_js:
+  - "iojs-v1.8"
+  - "iojs-v1.7"
+  - "iojs-v1.6"
+  - "iojs-v1.5"
+  - "iojs-v1.4"
+  - "iojs-v1.3"
+  - "iojs-v1.2"
+  - "iojs-v1.1"
+  - "iojs-v1.0"
+  - "0.12"
+  - "0.11"
+  - "0.10"
+  - "0.9"
+  - "0.8"
+  - "0.6"
+  - "0.4"
+before_install:
+  - '[ "${TRAVIS_NODE_VERSION}" == "0.6" ] || npm install -g npm@~1.4.6'
+matrix:
+  fast_finish: true
+  allow_failures:
+    - node_js: "iojs-v1.6"
+    - node_js: "iojs-v1.5"
+    - node_js: "iojs-v1.4"
+    - node_js: "iojs-v1.3"
+    - node_js: "iojs-v1.2"
+    - node_js: "iojs-v1.1"
+    - node_js: "iojs-v1.0"
+    - node_js: "0.11"
+    - node_js: "0.9"
+    - node_js: "0.8"
+    - node_js: "0.6"
+    - node_js: "0.4"
+sudo: false
--- a/node_modules/metalsmith-register-helpers/node_modules/extend/CHANGELOG.md
+++ b/node_modules/metalsmith-register-helpers/node_modules/extend/CHANGELOG.md
@ -0,0 +1,61 @@
+2.0.1 / 2015-04-25
+==================
+  * Use an inline `isArray` check, for ES3 browsers. (#27)
+  * Some old browsers fail when an identifier is `toString`
+  * Test latest `node` and `io.js` versions on `travis-ci`; speed up builds
+  * Add license info to package.json (#25)
+  * Update `tape`, `jscs`
+  * Adding a CHANGELOG
+
+2.0.0 / 2014-10-01
+==================
+  * Increase code coverage to 100%; run code coverage as part of tests
+  * Add `npm run lint`; Run linter as part of tests
+  * Remove nodeType and setInterval checks in isPlainObject
+  * Updating `tape`, `jscs`, `covert`
+  * General style and README cleanup
+
+1.3.0 / 2014-06-20
+==================
+  * Add component.json for browser support (#18)
+  * Use SVG for badges in README (#16)
+  * Updating `tape`, `covert`
+  * Updating travis-ci to work with multiple node versions
+  * Fix `deep === false` bug (returning target as {}) (#14)
+  * Fixing constructor checks in isPlainObject
+  * Adding additional test coverage
+  * Adding `npm run coverage`
+  * Add LICENSE (#13)
+  * Adding a warning about `false`, per #11
+  * General style and whitespace cleanup
+
+1.2.1 / 2013-09-14
+==================
+  * Fixing hasOwnProperty bugs that would only have shown up in specific browsers. Fixes #8
+  * Updating `tape`
+
+1.2.0 / 2013-09-02
+==================
+  * Updating the README: add badges
+  * Adding a missing variable reference.
+  * Using `tape` instead of `buster` for tests; add more tests (#7)
+  * Adding node 0.10 to Travis CI (#6)
+  * Enabling "npm test" and cleaning up package.json (#5)
+  * Add Travis CI.
+
+1.1.3 / 2012-12-06
+==================
+  * Added unit tests.
+  * Ensure extend function is named. (Looks nicer in a stack trace.)
+  * README cleanup.
+
+1.1.1 / 2012-11-07
+==================
+  * README cleanup.
+  * Added installation instructions.
+  * Added a missing semicolon
+
+1.0.0 / 2012-04-08
+==================
+  * Initial commit
+
--- a/node_modules/metalsmith-register-helpers/node_modules/extend/LICENSE
+++ b/node_modules/metalsmith-register-helpers/node_modules/extend/LICENSE
@ -0,0 +1,23 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Stefan Thomas
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
--- a/node_modules/metalsmith-register-helpers/node_modules/extend/README.md
+++ b/node_modules/metalsmith-register-helpers/node_modules/extend/README.md
@ -0,0 +1,62 @@
+[![Build Status][travis-svg]][travis-url]
+[![dependency status][deps-svg]][deps-url]
+[![dev dependency status][dev-deps-svg]][dev-deps-url]
+
+# extend() for Node.js <sup>[![Version Badge][npm-version-png]][npm-url]</sup>
+
+`node-extend` is a port of the classic extend() method from jQuery. It behaves as you expect. It is simple, tried and true.
+
+## Installation
+
+This package is available on [npm][npm-url] as: `extend`
+
+``` sh
+npm install extend
+```
+
+## Usage
+
+**Syntax:** extend **(** [`deep`], `target`, `object1`, [`objectN`] **)**
+
+*Extend one object with one or more others, returning the modified object.*
+
+Keep in mind that the target object will be modified, and will be returned from extend().
+
+If a boolean true is specified as the first argument, extend performs a deep copy, recursively copying any objects it finds. Otherwise, the copy will share structure with the original object(s).
+Undefined properties are not copied. However, properties inherited from the object's prototype will be copied over.
+Warning: passing `false` as the first argument is not supported.
+
+### Arguments
+
+* `deep` *Boolean* (optional)
+If set, the merge becomes recursive (i.e. deep copy).
+* `target`	*Object*
+The object to extend.
+* `object1`	*Object*
+The object that will be merged into the first.
+* `objectN` *Object* (Optional)
+More objects to merge into the first.
+
+## License
+
+`node-extend` is licensed under the [MIT License][mit-license-url].
+
+## Acknowledgements
+
+All credit to the jQuery authors for perfecting this amazing utility.
+
+Ported to Node.js by [Stefan Thomas][github-justmoon] with contributions by [Jonathan Buchanan][github-insin] and [Jordan Harband][github-ljharb].
+
+[travis-svg]: https://travis-ci.org/justmoon/node-extend.svg
+[travis-url]: https://travis-ci.org/justmoon/node-extend
+[npm-url]: https://npmjs.org/package/extend
+[mit-license-url]: http://opensource.org/licenses/MIT
+[github-justmoon]: https://github.com/justmoon
+[github-insin]: https://github.com/insin
+[github-ljharb]: https://github.com/ljharb
+[npm-version-png]: http://vb.teelaun.ch/justmoon/node-extend.svg
+[deps-svg]: https://david-dm.org/justmoon/node-extend.svg
+[deps-url]: https://david-dm.org/justmoon/node-extend
+[dev-deps-svg]: https://david-dm.org/justmoon/node-extend/dev-status.svg
+[dev-deps-url]: https://david-dm.org/justmoon/node-extend#info=devDependencies
+
--- a/node_modules/metalsmith-register-helpers/node_modules/extend/component.json
+++ b/node_modules/metalsmith-register-helpers/node_modules/extend/component.json
@ -0,0 +1,32 @@
+{
+	"name": "extend",
+	"author": "Stefan Thomas <justmoon@members.fsf.org> (http://www.justmoon.net)",
+	"version": "2.0.1",
+	"description": "Port of jQuery.extend for node.js and the browser.",
+	"scripts": [
+		"index.js"
+	],
+	"contributors": [
+		{
+			"name": "Jordan Harband",
+			"url": "https://github.com/ljharb"
+		}
+	],
+	"keywords": [
+		"extend",
+		"clone",
+		"merge"
+	],
+	"repository" : {
+		"type": "git",
+		"url": "https://github.com/justmoon/node-extend.git"
+	},
+	"dependencies": {
+	},
+	"devDependencies": {
+		"tape" : "~3.0.0",
+		"covert": "~0.4.0",
+		"jscs": "~1.6.2"
+	}
+}
+
--- a/node_modules/metalsmith-register-helpers/node_modules/extend/index.js
+++ b/node_modules/metalsmith-register-helpers/node_modules/extend/index.js
@ -0,0 +1,89 @@
+var hasOwn = Object.prototype.hasOwnProperty;
+var toStr = Object.prototype.toString;
+var undefined;
+
+var isArray = function isArray(arr) {
+	if (typeof Array.isArray === 'function') {
+		return Array.isArray(arr);
+	}
+
+	return toStr.call(arr) === '[object Array]';
+};
+
+var isPlainObject = function isPlainObject(obj) {
+	'use strict';
+	if (!obj || toStr.call(obj) !== '[object Object]') {
+		return false;
+	}
+
+	var has_own_constructor = hasOwn.call(obj, 'constructor');
+	var has_is_property_of_method = obj.constructor && obj.constructor.prototype && hasOwn.call(obj.constructor.prototype, 'isPrototypeOf');
+	// Not own constructor property must be Object
+	if (obj.constructor && !has_own_constructor && !has_is_property_of_method) {
+		return false;
+	}
+
+	// Own properties are enumerated firstly, so to speed up,
+	// if last one is own, then all properties are own.
+	var key;
+	for (key in obj) {}
+
+	return key === undefined || hasOwn.call(obj, key);
+};
+
+module.exports = function extend() {
+	'use strict';
+	var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0],
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if (typeof target === 'boolean') {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	} else if ((typeof target !== 'object' && typeof target !== 'function') || target == null) {
+		target = {};
+	}
+
+	for (; i < length; ++i) {
+		options = arguments[i];
+		// Only deal with non-null/undefined values
+		if (options != null) {
+			// Extend the base object
+			for (name in options) {
+				src = target[name];
+				copy = options[name];
+
+				// Prevent never-ending loop
+				if (target === copy) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if (deep && copy && (isPlainObject(copy) || (copyIsArray = isArray(copy)))) {
+					if (copyIsArray) {
+						copyIsArray = false;
+						clone = src && isArray(src) ? src : [];
+					} else {
+						clone = src && isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[name] = extend(deep, clone, copy);
+
+				// Don't bring in undefined values
+				} else if (copy !== undefined) {
+					target[name] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
--- a/node_modules/metalsmith-register-helpers/node_modules/extend/package.json
+++ b/node_modules/metalsmith-register-helpers/node_modules/extend/package.json
@ -0,0 +1,95 @@
+{
+  "_args": [
+    [
+      "extend@^2.0.0",
+      "/Users/xthemage/Documents/Website/node_modules/metalsmith-register-helpers"
+    ]
+  ],
+  "_from": "extend@>=2.0.0 <3.0.0",
+  "_id": "extend@2.0.1",
+  "_inCache": true,
+  "_installable": true,
+  "_location": "/metalsmith-register-helpers/extend",
+  "_nodeVersion": "1.8.1",
+  "_npmUser": {
+    "email": "ljharb@gmail.com",
+    "name": "ljharb"
+  },
+  "_npmVersion": "2.8.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "extend",
+    "raw": "extend@^2.0.0",
+    "rawSpec": "^2.0.0",
+    "scope": null,
+    "spec": ">=2.0.0 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/metalsmith-register-helpers"
+  ],
+  "_resolved": "https://registry.npmjs.org/extend/-/extend-2.0.1.tgz",
+  "_shasum": "1ee8010689e7395ff9448241c98652bc759a8260",
+  "_shrinkwrap": null,
+  "_spec": "extend@^2.0.0",
+  "_where": "/Users/xthemage/Documents/Website/node_modules/metalsmith-register-helpers",
+  "author": {
+    "email": "justmoon@members.fsf.org",
+    "name": "Stefan Thomas",
+    "url": "http://www.justmoon.net"
+  },
+  "bugs": {
+    "url": "https://github.com/justmoon/node-extend/issues"
+  },
+  "contributors": [
+    {
+      "name": "Jordan Harband",
+      "url": "https://github.com/ljharb"
+    }
+  ],
+  "dependencies": {},
+  "description": "Port of jQuery.extend for node.js and the browser",
+  "devDependencies": {
+    "covert": "^1.0.1",
+    "jscs": "^1.11.3",
+    "tape": "^4.0.0"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "1ee8010689e7395ff9448241c98652bc759a8260",
+    "tarball": "http://registry.npmjs.org/extend/-/extend-2.0.1.tgz"
+  },
+  "gitHead": "ce3790222d3d2051f728f74be9565f155ed599c3",
+  "homepage": "https://github.com/justmoon/node-extend#readme",
+  "keywords": [
+    "clone",
+    "extend",
+    "merge"
+  ],
+  "license": "MIT",
+  "main": "index",
+  "maintainers": [
+    {
+      "name": "justmoon",
+      "email": "justmoon@members.fsf.org"
+    },
+    {
+      "name": "ljharb",
+      "email": "ljharb@gmail.com"
+    }
+  ],
+  "name": "extend",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/justmoon/node-extend.git"
+  },
+  "scripts": {
+    "coverage": "covert test/index.js",
+    "coverage-quiet": "covert test/index.js --quiet",
+    "lint": "jscs *.js */*.js",
+    "test": "npm run lint && node test/index.js && npm run coverage-quiet"
+  },
+  "version": "2.0.1"
+}
--- a/node_modules/metalsmith-register-helpers/package.json
+++ b/node_modules/metalsmith-register-helpers/package.json
@ -0,0 +1,88 @@
+{
+  "_args": [
+    [
+      "metalsmith-register-helpers",
+      "/Users/xthemage/Documents/Website"
+    ]
+  ],
+  "_from": "metalsmith-register-helpers@*",
+  "_id": "metalsmith-register-helpers@0.1.2",
+  "_inCache": true,
+  "_installable": true,
+  "_location": "/metalsmith-register-helpers",
+  "_nodeVersion": "0.10.36",
+  "_npmUser": {
+    "email": "hello@kennethormandy.com",
+    "name": "kennethormandy"
+  },
+  "_npmVersion": "2.11.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "metalsmith-register-helpers",
+    "raw": "metalsmith-register-helpers",
+    "rawSpec": "",
+    "scope": null,
+    "spec": "*",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "#USER"
+  ],
+  "_resolved": "https://registry.npmjs.org/metalsmith-register-helpers/-/metalsmith-register-helpers-0.1.2.tgz",
+  "_shasum": "46113c5ebd9d4b04baea390049fce19d7cf27239",
+  "_shrinkwrap": null,
+  "_spec": "metalsmith-register-helpers",
+  "_where": "/Users/xthemage/Documents/Website",
+  "author": {
+    "email": "hello@kennethormandy.com",
+    "name": "Kenneth Ormandy",
+    "url": "http://kennethormandy.com"
+  },
+  "bugs": {
+    "url": "https://github.com/losttype/metalsmith-register-helpers/issues"
+  },
+  "contriblutors": [
+    "Bryce Kahle     <bkahle@gmail.com>         (http://brycekahle.com)",
+    "Kenneth Ormandy <hello@kennethormandy.com> (http://kennethormandy.com)",
+    "Lin Clark       <lin.w.clark@gmail.com>    (http://lin-clark.com)"
+  ],
+  "dependencies": {
+    "extend": "^2.0.0"
+  },
+  "description": "A Metalsmith plugin for registering Handlebars helpers.",
+  "devDependencies": {
+    "standard": "^4.4.0"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "46113c5ebd9d4b04baea390049fce19d7cf27239",
+    "tarball": "http://registry.npmjs.org/metalsmith-register-helpers/-/metalsmith-register-helpers-0.1.2.tgz"
+  },
+  "gitHead": "6b30c72385b223841e08a59c14bd35f1d22b79a6",
+  "homepage": "https://github.com/losttype/metalsmith-register-helpers#readme",
+  "keywords": [
+    "handlebars",
+    "helpers",
+    "metalsmith"
+  ],
+  "license": "MIT",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "kennethormandy",
+      "email": "hello@kennethormandy.com"
+    }
+  ],
+  "name": "metalsmith-register-helpers",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/losttype/metalsmith-register-helpers.git"
+  },
+  "scripts": {
+    "posttest": "standard",
+    "test": "echo \"Error: No test specified…yet! Pull requests on losttype/metalsmith-register-helpers are greatly appreciated.\" && exit 0"
+  },
+  "version": "0.1.2"
+}
--- a/src/css/index.css
+++ b/src/css/index.css
@ -168,6 +168,10 @@ body {
 .content li {
 	margin-bottom: 7px;
 }
+.content img {
+	margin-left: auto;
+	margin-right: auto;
+}

 .content strong {
 	font-family: 'Trebuchet MS', sans-serif;
@ -270,8 +274,6 @@ body {
 	font-style: italic;
 }

-
-
 .article .navigation {
 	margin-top: 10px;
 	margin-left: 60px;
@ -303,4 +305,31 @@ body {
 	padding-top: 0px;
 	margin-bottom: 30px;
 	font-variant: normal;
+}
+
+.person .project_list {
+	text-align: center;
+	font-size: 12px;
+	color: #041a9b;
+}
+.person img.photo {
+	float: right;
+	border: solid 2px gray;
+	margin-right: 50px;
+	margin-left: 30px;
+	margin-bottom: 30px;
+}
+.person .paper_list { 
+	margin-left: 50px;
+	margin-right: 50px;
+}
+.person .links {
+	text-align: center;
+}
+.person .links a {
+	font-size: 12px;
+	color: #041a9b;
+	margin-left: 20px;
+	margin-right: 20px;
+	text-decoration: none;
 }
--- a/src/grants/index.html
+++ b/src/grants/index.html
@ -1,3 +1,6 @@
+---
+title: Funding Sources
+---
 <p style="text-align: justify;"><strong>The ODIn lab relies on <span style="text-decoration: underline;">your</span> support, and the support of countless others to fulfill our goal of making data more accessible.</strong>  We're extremely grateful to the American taxpayer and for the support we've received from <a href="http://oracle.com">Oracle</a> and <a href="http://www.google.com/">Google</a>.  In the interest of openness and data accessibility, we're publishing the scientific content of our accepted proposals -- the same content that the reviewers see.</p>

 <div class="grants">
@ -6,8 +9,8 @@
 	<ul class="grants">
 		{{#each grants}}<li>
 			<div class="title">{{title}}</div>
-			<div class="section">${{amount}} from {{agency}}</div>
-			<div class="section"><span class="label">Authors:</span> {{{piFormat}}}</div>
+			<div class="section">${{number amount}} from {{agency}}</div>
+			<div class="section"><span class="label">PIs:</span> {{{piFormat}}}</div>
 			<div class="section"><span class="label">Supports:</span> {{{supportsFormat}}}</div>
 			<div class="section">{{{resourcesFormat}}}</div>
 		</li>{{/each}}
--- a/src/metadata/lab.json
+++ b/src/metadata/lab.json
@ -1,18 +1,75 @@
 {
-	"members" : [
-		"Oliver Kennedy",
-		"Ying Yang",
-		"Ting Xie",
-		"Gokhan Kul",
-		"Duc Thanh Luong",
-		"Poonam Kumari",
-		"Razieh Fathi",
-		"Niccolò Meneghetti",
-		"Jerry Ajay",
-		"Arindam Nandi",
-		"Vinayak Karuppasamy",
-		"Patrick Coonan"
-	],
+	"members" : {
+		"Oliver Kennedy" : {
+			"status" : "Faculty",
+			"ubit" : "okennedy"
+		},
+		"Ying Yang" : {
+			"status" : "PhD",
+			"projects" : ["mimir"],
+			"ubit" : "yyang25"
+		},
+		"Niccolò Meneghetti" : {
+			"status" : "PhD",
+			"projects" : ["mimir"], 
+			"ubit" : "niccolom",
+			"advisor" : ["Jan Chomicki"],
+			"link" : "http://www.acsu.buffalo.edu/~niccolom/"
+		},
+		"Ting Xie" : {
+			"status" : "PhD",
+			"projects" : ["insider-threats"],
+			"ubit" : "tingxie"
+		},
+		"Gokhan Kul" : {
+			"status" : "PhD",
+			"projects" : ["insider-threats"],
+			"ubit" : "gokhanku",
+			"advisor" : ["Shambhu Upadhyaya"],
+			"joint_advisor": true
+		},
+		"Duc Thanh Luong" : {
+			"status" : "PhD",
+			"projects" : ["insider-threats"], 
+			"ubit" : "ducthanh",
+			"advisor" : ["Varun Chandola"]
+		},
+		"Poonam Kumari" : {
+			"status" : "PhD",
+			"projects" : ["astral"], 
+			"ubit" : "poonamku"
+		},
+		"Razieh Fathi" : {
+			"status" : "PhD",
+			"ubit" : "raziehfa",
+			"advisor" : ["Lukasz Ziarek"],
+			"joint_advisor": true
+		},
+		"Jerry Antony Ajay" : {
+			"name" : "Jerry Ajay",
+			"status" : "PhD",
+			"projects" : ["pocketdata"], 
+			"ubit" : "jerryant",
+			"advisor" : ["Geoff Challen"],
+			"joint_advisor": true,
+			"link" : "https://blue.cse.buffalo.edu/people/jerryant/"
+		},
+		"Arindam Nandi" : {
+			"status" : "MS",
+			"projects" : ["mimir"], 
+			"ubit" : "arindamn"
+		},
+		"Vinayak Karuppasamy" : {
+			"status" : "MS",
+			"projects" : ["mimir"], 
+			"ubit" : "vinayakk"
+		},
+		"Patrick Coonan" : {
+			"status" : "BS/MS",
+			"projects" : ["insider-threats"], 
+			"ubit" : "pcoonan"
+		}
+	},
 	"collaborators" : [
 		"Lukasz Ziarek",
 		"Geoff Challen",
--- a/src/metadata/okennedy.json
+++ b/src/metadata/okennedy.json
--- a/src/metadata/publications.json
+++ b/src/metadata/publications.json
@ -7,15 +7,19 @@
    "venue":"MIST","year":2015,
    "urls" : {
      "paper" : "http://odin.cse.buffalo.edu/papers/2015/MIST-ontology-final.pdf"
-    }
+    },
+    "projects" : ["insider-threats"],
+    "hidden" : true
  },
  { "title":"On-Demand Query Result Cleaning",
    "authors":[
      "Ying Yang"
    ],
-    "venue":"VLDB-PHD","year":2014,
+    "venue":"VLDB","year":2014,
    "urls" : {
      "paper" : "http://odin.cse.buffalo.edu/papers/2014/VLDBPhD-ondemand-final.pdf"
-    }
+    },
+    "track":"phd",
+    "projects" : ["mimir"]
  }
 ]
--- a/src/papers/index.html
+++ b/src/papers/index.html
@ -5,12 +5,14 @@ title: Publications
 {{#each allpubs}}
 	<h1>{{year}}</h1>
 	<ul>{{#each pubs}}
+		{{#if visible}}
 		<li>
 			<div class="title">{{title}}</div>
 			<div class="authors">{{{authorFormat}}}</div>
 			<div class="metadata"><span class="venue">{{venue}}</span> 
 								  <span class="resources">{{{resourcesFormat}}}</span></div>
 		</li>
+		{{/if}}
 	{{/each}}</ul>
 {{/each}}
 </div>
--- a/src/people/index.html
+++ b/src/people/index.html
@ -3,30 +3,13 @@ title: Members and Affiliates
 ---
 <div class="person_list">
 	<h1>Lab Members</h1>
-		<div class="person">Oliver Kennedy
-			<span class="status">Faculty</span></div>
-		<div class="person">Ying Yang</span>
-			<span class="status">PhD</span></div>
-		<div class="person">Ting Xie
-			<span class="status">PhD</span></div>
-		<div class="person">Gokhan Kul
-			<span class="status">PhD; Jointly Advised by Shambhu Upadhyaya</span></div>
-		<div class="person">Duc Thanth Luong
-			<span class="status">PhD; Jointly Advised by Varun Chandola</span></div>
-		<div class="person">Poonam Kumari
-			<span class="status">PhD</span></div>
-		<div class="person">Razieh Fathi
-			<span class="status">PhD; Jointly Advised by Lukasz Ziarek</span></div>
-		<div class="person">Niccolò Meneghetti
-			<span class="status">PhD; Jointly Advised by Jan Chomicki</span></div>
-		<div class="person">Jerry Ajay
-			<span class="status">PhD; Jointly Advised by Geoff Challen</span></div>
-		<div class="person">Arindam Nandi</span>
-			<span class="status">MS</span></div>
-		<div class="person">Vinayak Karuppasamy</span>
-			<span class="status">MS</span></div>
-		<div class="person">Patrick Coonan
-			<span class="status">BS/MS</span></div>
+	{{#each odinLab.members}}
+		<div class="person">
+			<a href="{{#if linkRelative}}{{../rootPath}}{{/if}}{{link}}">{{name}}</a>
+			<span class="status">
+				{{status}}{{#if advisor}}; {{#if joint_advisor}}Jointly{{/if}} Advised by {{list advisor}}{{/if}}
+			</span></div>
+	{{/each}}

 	<h1>Collaborators</h1>
 		<div class="person"><a href="http://www.cse.buffalo.edu/~lziarek">Lukasz Ziarek</a>
@ -66,7 +49,7 @@ title: Members and Affiliates
 <h1>Affiliations</h1>
 <center>
 <a href="http://www.infofusion.buffalo.edu/">
-	<img src="assets/logos/cmif.gif" width="459" height="57" style="border: solid 2px grey"/>
+	<img src="{{rootPath}}assets/logos/cmif.gif" width="459" height="57" style="border: solid 2px grey"/>
 </a>
 </center>

--- a/src/people/oliver_kennedy.md
+++ b/src/people/oliver_kennedy.md
@ -0,0 +1,15 @@
+---
+github: okennedy
+twitter: xthemage
+cv: http://www.cse.buffalo.edu/~okennedy/okennedy.pdf
+pic: ../assets/people/oliver.jpg
+pic_w: 181
+pic_h: 234
+---
+
+Oliver Kennedy is an Assistant Professor at the University at Buffalo.  Oliver's primary area of research is Databases, although his research interests frequently cross over into Programming Languages and Datastructures.  His work focuses on making probabilistic data approachable, on designing adaptive index datastructures, and on designing new database infrastructure based on traces from real-world settings like banks and smartphones.
+
+Oliver is a graduate of <a href="http://www.cscornell.edu">Cornell University</a>, where he developed a powerful tool for compiling highly specialized database engines called <a href="http://www.dbtoaster.org">DBToaster</a>.  DBToaster was featured in The VLDB Journal's issue on the best papers of VLDB 2012.  Oliver continued these efforts as a Postdoc at <a href="http://data.epfl.ch">The DATA lab</a> at <a href="http://www.epfl.ch">EPFL</a>.
+
+In addition to his research efforts, Oliver can be found participating in outreach programs through <a href="http://libertypartnerships.com/">The LIBERTY Partnerships</a> and UB's branch of <a href="http://www.elementaryschoolscience.org">Science is Elementary</a>, studying Western Martial Arts disciplines including Capo Ferro, or cooking with his awesome wife Chris.
+
--- a/src/research/mimir/index.md
+++ b/src/research/mimir/index.md
@ -1,34 +1,41 @@
+---
+title: Mimir
+---
 <img src="../../assets/logos/mimir_logo_final.png" alt="mimir_logo_final" width="539" height="214" />
-<p style="text-align: justify;"><b>Students:</b> Ying Yang, Niccolo Meneghetti, Arindam Nandi, Vinayak Karuppasamy</p>
-<img src="screenshots/Mimir_Screenshot.png" alt="Mimir_Screenshot" width="643" height="564" />
-<p style="text-align: justify;">Many analytics tasks are based on information that is initially incomplete, inconsistent, or simply used incorrectly. Although a variety of strategies exist to help people cope with these sources of uncertainty, they often require users to undertake heavyweight upfront organizationational tasks (i.e., tagging, data-cleaning, or modeling) before the data can be used.  Automated techniques exist, but typically introduce their own forms of uncertainty.</p>
-<p style="text-align: justify;">Mimir takes a step back and accepts that uncertainty is a fact of life.  Rather than trying to fight it, Mimir embraces uncertainty, and helps users to understand it better.  Combining automated data cleaning and data analysis techniques, Mimir's goal is to help users clean and query uncertain data, and to understand the impact of that uncertainty on the results of their analyses.</p>

-<hr />
-<p style="text-align: justify;">Currently, the Mimir project has two active initiatives:</p>
+__Students:__ Ying Yang, Niccolo Meneghetti, Arindam Nandi, Vinayak Karuppasamy

-<ul style="text-align: justify;">
-	<li><b>On-Demand Data Certainty</b>: Asserting the correctness, consistency, and completeness of a dataset is an extremely expensive, time-consuming process. Worse still, the effort expended on this task may be disproportionately high when compared to the fragment of the dataset that is actually queried by end-users. This initiative looks for strategies that make it easier for data-cleaning and data-gathering tasks to be performed on-demand -- as the data is queried. Our current focus is on a form of targetted crowdsourcing, where users querying uncertain data are presented with a prioritized list of data-cleaning/-collection tasks that will increase confidence in the result set.</li>
-	<li><b>Consistent Query Semantics</b>: Minor differences in data semantics can easily combine to produce subtle errors in the correctness of a query. For example, when a table listing historical orders is joined with a table of current currency conversions, the result may be inaccurate (depending on what the user's intent is): The exchange rate listed will be valid as of today, and not when the order was placed. Unfortunately, detecting these errors is difficult, as it is not generally possible to gauge user intent, or to ask users to provide such fine-grained semantic information about data. Using a combination of natural language processing, and usage modeling, we instead seek to answer a simpler, though closely related question: "Will the answer to my query be the same if I ask it tomorrow?"</li>
-</ul>
-<p style="text-align: justify;"><i>(Mimir is supported by gifts from Oracle University Relations, and is being developed in collaboration with Ronny Fehling, Dieter Gawlick, Zhen Hua Liu and Jan Chomicki)</i></p>
+_(Mimir is supported by gifts from Oracle University Relations, and is being developed in collaboration with Ronny Fehling, Dieter Gawlick, Zhen Hua Liu, Boris Glavic, and Jan Chomicki)_

-<h4 style="text-align: justify;">Software</h4>
-<ul style="text-align: justify;">
-	<li>The Mimir Uncertain Database (<a href="https://github.com/UBOdin/mimir">GitHub</a>)</li>
-</ul>
-<h4 style="text-align: justify;">Publications</h4>
+<img src="screenshots/Mimir_Screenshot.png" alt="Mimir_Screenshot" width="500" height="438" />
+
+Many analytics tasks are based on information that is initially incomplete, inconsistent, or simply used incorrectly. Although a variety of strategies exist to help people cope with these sources of uncertainty, they often require users to undertake heavyweight upfront organizationational tasks (i.e., tagging, data-cleaning, or modeling) before the data can be used.  Automated techniques exist, but typically introduce their own forms of uncertainty.
+
+Mimir takes a step back and accepts that uncertainty is a fact of life.  Rather than trying to fight it, Mimir embraces uncertainty, and helps users to understand it better.  Combining automated data cleaning and data analysis techniques, Mimir's goal is to help users clean and query uncertain data, and to understand the impact of that uncertainty on the results of their analyses.
+
+------
+## Active Research 
+
+### On-Demand Data Certainty
+Asserting the correctness, consistency, and completeness of a dataset is an extremely expensive, time-consuming process. Worse still, the effort expended on this task may be disproportionately high when compared to the fragment of the dataset that is actually queried by end-users. This initiative looks for strategies that make it easier for data-cleaning and data-gathering tasks to be performed on-demand -- as the data is queried. Our current focus is on a form of targetted crowdsourcing, where users querying uncertain data are presented with a prioritized list of data-cleaning/-collection tasks that will increase confidence in the result set.
+
+### Consistent Query Semantics
+Minor differences in data semantics can easily combine to produce subtle errors in the correctness of a query. For example, when a table listing historical orders is joined with a table of current currency conversions, the result may be inaccurate (depending on what the user's intent is): The exchange rate listed will be valid as of today, and not when the order was placed. Unfortunately, detecting these errors is difficult, as it is not generally possible to gauge user intent, or to ask users to provide such fine-grained semantic information about data. Using a combination of natural language processing, and usage modeling, we instead seek to answer a simpler, though closely related question: "Will the answer to my query be the same if I ask it tomorrow?"
+
+------
+
+## Software
 <ul>
-	<li style="text-align: justify;"><b>Lenses: An On-Demand Approach to ETL</b>
-<i>VLDB 2015</i> ( <a href="{{rootPath}}papers/2015/VLDB-lenses-final.pdf">paper</a> | <a href="http://odin.cse.buffalo.edu/slides/conference/2015-Ying-VLDB-Mimir.pdf">slides</a> )</li>
-	<li style="text-align: justify;"><b>Detecting the Temporal Context of Queries</b>
-<i>BIRTE 2014</i> ( <a href="{{rootPath}}papers/2014/BIRTE-context-final.pdf">paper</a> )</li>
-	<li style="text-align: justify;"><b>On-Demand Query Result Cleaning</b>
-<i>VLDB PhD Workshop 2014</i> ( <a href="{{rootPath}}papers/2014/VLDBPhD-ondemand-final.pdf">paper</a> )</li>
-</ul>
-<h4>Presentations</h4>
-<ul>
-	<li><a href="https://www.youtube.com/watch?v=jow4JmDOxPs">Video Demo</a> (2015)</li>
-	<li><a href="http://odin.cse.buffalo.edu/slides/talks/2015-2-Mimir">Overview Slides</a> (2015)</li>
-	<li><a href="{{rootPath}}rants/2015-08-13-incorrect-dbs.html">Rant: What if Databases Could Answer Incorrectly</a> (2015)</li>
+	<li><a href="https://github.com/UBOdin/mimir">Mimir on GitHub</a></li>
 </ul>
+
+## Publications
+
+{{#each projectPubs.mimir}}
+* __{{title}}__ <br/> _{{venue}}_ {{{resourcesFormat}}}
+{{/each}}
+
+## Presentations
+* <a href="https://www.youtube.com/watch?v=jow4JmDOxPs">Video Demo</a> (2015)
+* <a href="http://odin.cse.buffalo.edu/slides/talks/2015-2-Mimir">Overview Slides</a> (2015)
+* <a href="{{rootPath}}rants/2015-08-13-incorrect-dbs.html">Rant: What if Databases Could Answer Incorrectly</a> (2015)
--- a/stages/build-grants.js
+++ b/stages/build-grants.js
@ -1,11 +1,10 @@
 module.exports = plugin;

-var formatAuthor = require("../lib/format-author.js");
+var formatAuthor = require("../lib/format-name.js");

 function plugin() {
  return function (files, smith, done){
-    var lab = smith.metadata().odinLab.members.concat(
-              smith.metadata().odinLab.alumni);
+    var lab = smith.metadata().labMembers;
    var grants = smith.metadata().okennedy.data.grants;
    var grantsByYear = {}
    for(i in grants){
@ -16,7 +15,7 @@ function plugin() {

      var pis = [ smith.metadata().okennedy.data.name ]
      if(typeof grant.copis != 'undefined'){
-        pis = pis.concat(grant.copis)
+        pis = grant.copis.concat(pis)
      }
      // console.log(pis)
      var piFormat = pis.map(formatAuthor(lab)).join(", ")
--- a/stages/build-members.js
+++ b/stages/build-members.js
@ -0,0 +1,69 @@
+module.exports = plugin;
+
+var formatName = require("../lib/format-name.js");
+var linkName = require("../lib/link-name.js");
+var push = function(arr, key, elem)
+{
+  if(typeof arr[key] == 'undefined') { arr[key] = [] }
+  arr[key].push(elem)
+}
+
+function plugin() {
+  return function (files, smith, done){
+    var members = smith.metadata().odinLab.members;
+    var alumni  = smith.metadata().odinLab.alumni;
+
+    var studentsByProject = {}
+    var lab = []
+
+    for(name in members){
+      var details = members[name];
+      lab.push(name)
+      if(typeof details.name == 'undefined'){
+        details.name = name;
+      } else {
+        lab.push(details.name)
+      }
+
+      if(typeof details.projects != 'undefined')
+      {
+        details.projectsFormat = (
+          "(" + 
+          details.projects.map(function(project){
+            var projectCapitalized = 
+              project.split("-").map(function(word){
+                return word.charAt(0).toUpperCase() + word.slice(1);
+              }).join(" ");
+            return "<a href='../research/"+project+"/index.html'>"+projectCapitalized+"</a>"
+          }).join(" | ")
+          + ")"
+        )
+      }
+      if(typeof details.link == 'undefined'){
+        details.link = linkName(name)
+        details.linkRelative = true;
+      }
+      memberLink = linkName(name, ".md")
+      var memberPage = files[memberLink]
+      if(memberPage == null){
+        memberPage = {
+          contents: name + " hasn't written anything about themselves yet"
+        }
+      }
+      if(typeof memberPage.title == 'undefined'){
+        memberPage.title = name
+      }
+      memberPage.details = details;
+      files[memberLink] = memberPage;
+      // console.log(files)
+    }
+
+    
+    lab = lab.concat(alumni)
+
+    smith.metadata().labMembers = lab
+
+
+    done()
+  }
+}
--- a/stages/build-pubs.js
+++ b/stages/build-pubs.js
@ -1,15 +1,20 @@
 module.exports = plugin;

-var formatAuthor = require("../lib/format-author.js");
+var formatAuthor = require("../lib/format-name.js");
+var push = function(arr, key, elem)
+{
+  if(typeof arr[key] == 'undefined') { arr[key] = [] }
+  arr[key].push(elem)
+}

 function plugin() {
  return function (files, smith, done){
-    var lab = smith.metadata().odinLab.members.concat(
-              smith.metadata().odinLab.alumni);
+    var lab = smith.metadata().labMembers;
    var pubs = smith.metadata().okennedy.data.publications.concat(
               smith.metadata().altPubs);
    var venues = smith.metadata().okennedy.venues;
    var pubsByYear = {}
+    var pubsByProject = {}
    for(i in pubs){
      var pub = pubs[i]
      var venue = venues[pub.venue] || {}
@ -18,6 +23,7 @@ function plugin() {
      if(venue.type == "techreport") {
        if(pub.venue != "ArXiv"){ continue; }
      }
+
      var authorFormat = 
        pub.authors
          .map(formatAuthor(lab))
@ -27,9 +33,6 @@ function plugin() {
        throw "Unknown year for "+pub
      }

-      if(typeof pubsByYear[pub.year] == 'undefined') {
-        pubsByYear[pub.year] = []
-      }

      var resourcesFormat = ""
      if(typeof pub.urls == 'object') {
@ -39,16 +42,47 @@ function plugin() {
        }
        resourcesFormat = "(&nbsp;"+resources.join("&nbsp;|&nbsp;")+"&nbsp;)";
      }
+      var venue = pub.venue;
+      // console.log(pub);
+      if(typeof pub.track != 'undefined'){
+        venue = venue+"-"+pub.track.toUpperCase();
+      }
+      venue = venue+" "+pub.year

-      pubsByYear[pub.year].push(
+      var pubMeta = 
        { 
          title: pub.title,
+          visible: !(pub.hidden || false),
          authorFormat: authorFormat,
          authors: pub.authors,
-          venue: pub.venue+" "+pub.year,
-          resourcesFormat: resourcesFormat
+          venue: venue,
+          resourcesFormat: resourcesFormat,
+          projects: pub.projects
        }
-      )
+      // console.log(pubMeta)
+
+      // Associate the publication with its year, but only if not hidden
+      push(pubsByYear, pub.year, pubMeta)
+
+      // Associate the publication with each of its authors if they're lab
+      // members
+      for(i in pub.authors){
+        var author = pub.authors[i]
+        // console.log("affiliating " +pub.title+" with "+author)
+        // console.log(smith.metadata().odinLab.members[author])
+        if(typeof smith.metadata().odinLab.members[author] != 'undefined'){
+          if(typeof smith.metadata().odinLab.members[author].pubs == 'undefined'){
+            smith.metadata().odinLab.members[author].pubs = [pubMeta]
+          } else {
+            smith.metadata().odinLab.members[author].pubs.push(pubMeta)
+          }
+        }
+      }
+
+      // Associate the publication with each of its projects
+      for(p in pub.projects){
+        push(pubsByProject, pub.projects[p].replace(/-/g,""), pubMeta)
+      }
    }
    var out = []
    for(i in pubsByYear) {
@ -56,6 +90,7 @@ function plugin() {
    }
    // console.log(out)
    smith.metadata()["allpubs"] = out.reverse()
+    smith.metadata()["projectPubs"] = pubsByProject
    done()
  }
 }
				`@ -0,0 +1 @@`
				`module.exports = function(l){ return l.join(", ") }`