Add a basic version check
noinil.el edited
custom.el edited again
Merge remote-tracking branch 'upstream/master'
master merged for merge with origin