forgot to remove this earlier - not needed
Merge branch 'master' into winie-2
re-unpin browserify

inadvertantly repinned in merging win-ie branch.
updating libs used

applying changes made to sinatra version
if on windows, don't try looking in /dev

on /dev fs on windows, so don't look there (it prevents the server
starting).
server-side images in sinatra and express
Merge branch 'master' into winie-2
Merge pull request #370 from paul90/winie-2

Tidying up.
Merge branch 'master' of github.com:WardCunningham/Smallest-Federated-Wiki