git-nuc: added a script for merging master => nuc
Merge branch 'master' into nuc