All development from heartFelt project since the famous 'majormerge' of July 2012

This contains a bunch of stuff, most of which should be immediately compatible considering my branch has the latest from nwilming/master merged into it already. There are however numerous trivial whitespace and comment changes, and there are a few additions which may not be desired for the general project (the 'dbg()/set_dbg_lvl()' functions for example, despite their extreme elegance and utility).