Updating master with my latest work

Dirty save, initial preview, permalinks for files..