Merge branch 'master' of github.com:daboross/TimedBlockReplace

Conflicts:
	src/main/java/net/daboross/bukkitdev/timedblockreplace/ConfigChangeCommandHandler.java
	src/main/java/net/daboross/bukkitdev/timedblockreplace/subcommandhandlers/AddCommandHandler.java
	src/main/java/net/daboross/bukkitdev/timedblockreplace/subcommandhandlers/ListCommandHandler.java
	src/main/java/net/daboross/bukkitdev/timedblockreplace/subcommandhandlers/RemoveCommandHandler.java
	src/main/resources/plugin.yml

Merge