Avoid internal compiler errors with g++ 4.7 #21
Correct lint warnings #21
Merge branch 'boost_upgrade'