Merge pull request #238 from geek/master

Remove no-lonely-if
Removing consistent-return