Rfxtrx config validatin breaking the components

[turbokongen]

Home Assistant release (hass --version):
0.18.dev0

Python release (python3 --version):
3.5.1

Component/platform:
rfxtrx

Description of problem:
The config validation has broken the rfxtrx component at switch, light, and sensor level.
It reports back:
16-04-09 09:52:27 homeassistant.bootstrap: Invalid config for [rfxtrx]: extra keys not allowed @ data['zwave']
In this case it reports zwave as extra key, but at each restart it pics a random component in the config.
Expected:

Problem-relevant configuration.yaml entries and steps to reproduce:

homeassistant:
  # Name of the location where Home Assistant is running
  name: 'Drømmehuset'
  # Location required to calculate the time the sun rises and sets
  latitude: xxx
  longitude: xxx
  # C for Celcius, F for Fahrenheit
  temperature_unit: C
  # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
  time_zone: Europe/Oslo

##########################################################
# Personligfisering
##########################################################
  customize: !include customize.yaml

# Discover some devices automatically
# discovery:

# Pushbullet notification service
notify:
  platform: pushbullet
  api_key: xxx
  name: 'pushmelding'

# Zwave settings
zwave:
  usb_path: /dev/ttyACM0
  config_path: /usr/local/share/python-openzwave/config
  polling_interval: 60000
  debug: 0

# RFXtrx433E settings
rfxtrx:
  device: /dev/serial/by-id/usb-RFXCOM_RFXtrx433_A1Z69C6G-if00-port0

# Enables support for tracking state changes over time.
history:
  placeholder: true

# Track the sun
sun:

# Enables the frontend
frontend:

# View all events in a logbook
logbook:

# Show links to resources in log and frontend
#introduction:

# Allows you to issue voice commands from the frontend
#conversation:

# Checks for available updates
# updater:

# Verisure Hub
verisure:
 username: xxx
 password: xxx
 code_digits: 6

http:
 development: 1
 api_password: xxx

########################################################
# Overvåkere
########################################################
device_tracker:
  - platform: ddwrt
    host: 10.0.0.138
    username: xxx
    password: xxx
  - platform: ddwrt
    host: 10.0.0.88
    username: xxx
    password: xxx

########################################################
# Grupper
########################################################
group: !include group.yaml

#########################################################
# Sensorer
#########################################################
sensor: !include sensor.yaml

#########################################################
# Brytere
#########################################################
switch: !include switches.yaml
#########################################################
# Lysbrytere
#########################################################
light: !include light.yaml
#########################################################
# Thermostats
#########################################################
thermostat: !include thermostat.yaml

#########################################################
# Automation
#########################################################
automation: !include automation.yaml

####################################
# Automation scripts
####################################
script: !include script.yaml

media_player:
  - platform: cast
#  platform: samsungtv
#  host: 10.0.0.13
#  port: 7676

input_select: !include input_select.yaml

Traceback (if applicable):

16-04-09 09:52:10 homeassistant.bootstrap: Invalid config for [rfxtrx]: extra keys not allowed @ data['zwave']
16-04-09 09:52:10 homeassistant.bootstrap: Unable to prepare setup for platform switch.rfxtrx because dependency rfxtrx could not be initialized
16-04-09 09:52:11 homeassistant.bootstrap: Invalid config for [rfxtrx]: extra keys not allowed @ data['zwave']
16-04-09 09:52:11 homeassistant.bootstrap: Unable to prepare setup for platform sensor.rfxtrx because dependency rfxtrx could not be initialized
16-04-09 09:52:00 homeassistant.bootstrap: Invalid config for [rfxtrx]: extra keys not allowed @ data['zwave']
16-04-09 09:52:00 homeassistant.bootstrap: Unable to prepare setup for platform light.rfxtrx because dependency rfxtrx could not be initialized

Additional info:

[Danielhiversen]

I'm sorry for that. I will not be able to fix it before Monday 😢