Most power measurement code and AMG changes to monitor power use
Merge branch 'kulfiDevelop' of https://github.com/bronevet/sight into kulfiDevelop

Conflicts:
	apps/AMG2013/test/amg2013.c
	sight_common.C
	widgets/trace/trace_structure.C