add merge-diff git alias
add boot2docker 1.3 env vars
add ncmpcpp bindings file