Add sessions, cleanup upload further
Merge branch 'master' of github.com:vishwin/coffeestop