Remove x directory and moved 'database' and 'terms' directories to the main directory
Merge branch 'master' of github.com:binarybottle/mindboggle