update Merge conflicts
Update to remote
Merge pull request #1 from FoundationDB/master

Merge trunk to my fork?
Merge branch 'master' of https://github.com/tjoneslo/akiban-server
merge from trunk
Add missing file
merge tjoneslo: Types2 removal

Merge pull request #881 from tjoneslo/akiban-server/types2-removal
https://github.com/FoundationDB/sql-layer/pull/881