Merge pull request #146 from RealRancor/master

Improved ownCloud tests
Hopefully fix some ' escaping issues in sql output. Minor cleanups.
potential encryption programs