Added some benchmarking vars
Updated the index to match the new layout of the MVC
Modified the layout for the configuration files
Merge branch 'develop' into integration/propel