Updated dispaly_block() macro.
Combined macros (except menu) into one file. Since you cannot import macros files into another, it doesn't make sense to separate them.
Added 'main' css to homepage template.
Added some styles for the homepage map section.
Removed 'relationships' from lazyloader.
Loaded homepage maps.
Fixed macro refs.
Resolved merge conflicts.