Add a map!
Minor cleanups.
Ignore .DS_Store files, make the timeOrFromNow more consistent, and make my syntax highlighter stop complaining about the “else if”.  :)
Merge branch 'master' into yyz