Added test directories
Added build to ignore
Fixed typo in build script
Merged remote master