xtuple/xtuple — pull request #1070 by tjwebb (2013-11-18 17:50:29+00:00)
Title: Revert pulls 1049 1067

Revert pull requests #1049 and #1067. Master is restored to a working state.

```
1676 tests complete (2 minutes)
111 tests pending
```