Merge pull request #12 from anchor/add-time-command

Add a time command to data
fix time
Merge branch 'master' of https://github.com/anchor/marquise into fix-time

Conflicts:
	src/DataProgram.hs
missed a change because emacs crashed again WTF
Merge pull request #17 from anchor/fix-time

Looks good
Merge branch 'master' into 'human-readable'

Conflicts:
	lib/Marquise/Client.hs
	lib/Marquise/IO/Util.hs
	src/DataProgram.hs
Clean up imports