In a round and about way I've merged master and Config.
Split out the frameworks options into its own partial.
Split out the frameworks options into its own partial.
Updated Grid settings, so it uses variables for widths and grids.