match major.minor
Merge branch 'master' of git://github.com/micnews/condor

Conflicts:
  columns.json
add date and timezone columns
Merge pull request #37 from dominictarr/missing-columns

Missing columns