Change default location of `warehouse` and `metastore`

[edfreeman]

Change default location of warehouse and metastore so that they are collocated. Otherwise it's a bit untidy. Could even put them in the same sub-directory?