Azalea code to update to C++11
Merge branch 'upstream' into cxx11

Conflicts:
	debian/changelog
	debian/control
Update to build with C++11, fix silly warnings