5-15-2014 1608

added idle
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #37 from DevenSmith/master

shh just accept my merge