Attempting a fix for having the remote refs be copied over when a transaction ends.
Added partial stack trace to unexpected exception responses to help with web-api debugging. Fixed a bug in EndTransaction.

In TransactionEnd, when it does a merge commit there was the possibility for it to result in conflicts thus leaving the repo in a conflicted state. To fix this we use the their's strategy as a temporary solution.
Skip SQLite tests if Spatialite fails to load
Merge pull request #337 from dwins/conditional-sqlite-testing

Skip SQLite tests if Spatialite fails to load
Merge remote-tracking branch 'origin/pr/327'
Add Travis yaml with spatialite dependency and build image
Merge branch 'master' of github.com:tlpinney/GeoGit