Merge pull request #14 from xtuple/master

update
Merge pull request #15 from xtuple/master

update from xtuple master to mike master
removed unnecessary include
Merge pull request #47 from mikerodonnell89/xlineedit

remove unnecessary include