Added fold-markers, and set vim lagnuage to fold by markers; Restructured some configurations and moved them around.