Adding back missing settings menu.
Merge branch 'master' of github.com:slamdata/slamdata into missing-settings

Conflicts:
	bin/node-webkit/js/slamdata-node-webkit.js
Lock in purescript-control version to 0.2.0.

Really, we just need to fix purescript-lens.
Lock in purescript-either to 0.1.2.
Relax dep constraints.
Merge pull request #85 from joneshf/missing-settings

Adding back missing settings menu.