Added Forrest Tanaka info to user.json
Made few changes to facet order and labels
Merge pull request #288 from ENCODE-DCC/fytanaka-user

Added Forrest Tanaka info to user.json
Merge pull request #289 from ENCODE-DCC/1434_new

Made few changes to facet order and labels
Avoid caching logout view so cookie is cleared on IE9/10
Fixup falfel so npm shrinkwrap works.
See: https://github.com/substack/node-falafel/pull/29
pytest-instafail for faster error reports on travis.
Merging in master.