Initial setup. Need gitignore, lib and tmp at least
Merge with master