Merge branch '0.1-UpdatePlug' into 0.1

Conflicts:
 lib/updates.js
 lib/views.js