Merge pull request #1288 from dengemann/fix_ica_n_samples

FIX: incorrect n_samples ICA
correct default ch_type to string value
Merge branch 'master' of https://github.com/mne-tools/mne-python
fix error msg on bad ch_types entry
add test for failed default ch_type
Merge pull request #1289 from maedoc/master

Fix default ch_type handling in create_info
ENH: Added colour param to plot_events
STY: fixed typo.
changed ev_idx to ev_mask
FIX: implemented cycle on colours
FIX: substituted next with zip in enumerate
ENH: added event_id and legend
ENH: event_id and colour dictionaries implemented, and legend
ENH: refactored event_id, colour and legend handling
ENH: tests + working event/color combinations.
ENH: code improvements.
reinstated warning
ENH: added event_id/color checks + example.
ENH: ylim scales with event_id values
sorted out logic for input dictionaries