Update template with more configs & fixes

fixed conditional flags/argv not working.  openning brace needed to
follow the condition...
add in C++11 support and pedantic fix
update template
Merge remote-tracking branch 'origin/master' into development-&-experimental