Fix for bug 1251994

See: https://bugs.launchpad.net/ultisnips/+bug/1251994
Add a test case for bug 1251994
Added taketwo to the list of contributors.
Merged bug fix for bug 1251994.