fix syntax error from bad merge
orient ws
restore missing stanza from bad merge

So sorry, @jasoncalabrese.
    git checkout 70f509966c2e681fecace735ff04509749caacd5 -- src/js/pebble-js-app.js
    git reset -p HEAD
Allowed me to split the hunks small enough to fix easily.
merged bewest/config/init