Merge remote-tracking branch 'upstream/master' into fix/bootuperrors

Conflicts:
	plugins/autoOpPlugin.php
	plugins/fileReaderPlugin.php
	plugins/rssPlugin.php
Merge remote-tracking branch 'upstream/master' into feature/helpcommand
Merge pull request #20 from hashworks/fix/bootuperrors

Fix some bootup warnings for specific config settings
Merge pull request #19 from hashworks/fix/gitignore

Fix gitignore, add feature to ignore thirdparty plugins
Merge pull request #24 from hashworks/feature/helpcommand

Feature: help command
Merge remote-tracking branch 'upstream/master'