Made setup flag volatile
Added plugin only option to makefile
Merge branch 'master' into smart_log