unpicked some changes made temporarily to fix a broken working copy
Merge branch 'master' of github.com:surevine/neon