code cleanup and license update
Update project settings and gitignore.
Merge remote-tracking branch 'upstream/master'