Sync Sandbox up to Develop

This should fix a bunch of "coding convention" issues and it should move the data gathering for things that should be parsed before placing links up top.