Merge pull request #9 from jlburkhead/dev

Link CLI and Server
Merge pull request #10 from jlburkhead/dev

don't require timestamp on init