Moving core handlers to the module loader file. Leaving plugin handlers to be dealt with later in original file.
Keeping up to date with development branch.
Fixing mergetool artifacts.
Merge branch 'development' of https://github.com/toppatch/vfense into humberto_module_loader
Removing deleted modules.