basic tidy-ups

+ whitespace
+ add travis and merlin support
+ add local makefile rules and config to oasis
+ minified foundation css
+ fix a few uri paths

some of the changes here refer to `site/` which is where my site-specific files will live, but hopefully they can be safely ignored