ENH: better type check for Epochs. closes #1002
Expand drop_log docstring
Merge pull request #1004 from TalLinzen/drop_log_docstring

Expand drop_log docstring
Only MEG channels in topography
Merge pull request #1007 from TalLinzen/auto_topomap_channels

Only MEG channels in topography
Add KIT-157 layout
Uploaded the right files this time
fix auto topomap
Fix docstring for Layout class

Conflicts:
	mne/layouts/layout.py
Avoid merge conflict
Merge pull request #1010 from TalLinzen/layout_docstring_new

Fix docstring for Layout class
Update dataframe docstring in Evoked
Merge pull request #1012 from TalLinzen/evoked_df_docstring_2

Update dataframe docstring in Evoked (second attempt)
STY proper error message for auto coords RuntimeError
Merge pull request #1008 from TalLinzen/kit_nyc_layout

ENH: Add KIT-157 layout
API: add deprecated ch_names parameter for backwards compatibility
ENH:  remove KIT specific fix and add general interface to events
STY:  array shape in DOCs
ENH: add ContainsMixin
revert git mess