more settings tweaks
fixing nsa settings
improving locality navigation and fixing #106
Cleaning up keroku dependencis
Clean bug with static file serving
Improving texts. closing #113
Tags are almost here... stil #fails
Tags are almost done, #87
Merge branch 'master' of https://github.com/hasadna/open-shot

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
merge