Cleaning up server-side rewrite
Updating files that are rewritten on the server side
Bumping version to 0.5.4 and updating dependencies