Merge pull request #6 from wvoelcker/master

Hooking press-return on new-search form
Sync and new API.
Comment out fetches.
Updated server API code.
Resolving conflicts and importing recent changes from upstream