correct check
Merge remote-tracking branch 'steve/master'

Conflicts:
	src/com/millennialmedia/intellibot/psi/RobotKeywordProvider.java
add test