Merge branch 'master' into tests-fixes
Optional arguments should be defined at end
Rename one of our operator functions, and fix docblock
Add a new test for new operator function
Minor fixes to operator tests
Re-organize ACP language

Prefix all ACP lang vars with ACP_ and organize them a little more
Merge pull request #99 from VSEphpbb/tests-fixes

Some additional fixes, updates, and new tests