Added details about how to get code and install
Merge branches 'dev' and 'master'