Merge pull request #17 from DevenSmith/master

4-3-2014 1010
More fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs