add g++ for Red Hat
remove vim modeline
Merge remote branch 'upstream/master' into develop
Merge branch 'release/syncupstream'
Merge pull request #7 from jbartko/master

add g++ for Red Hat