Upd: File clean up
Add: Travis dotfile and tidy up of build file
Merge