Disable a bunch of stuff giving me trouble, update sbt-idea
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/build.sbt