Merge pull request #15 from akbargumbira/master

Resolve conflict after merging with Tim's PR
Merge pull request #16 from akbargumbira/master

Small Work
Merge pull request #17 from akbargumbira/master

Dont add inasafe source while building and mount it instead.