Moved all files up on level

There was no reason for them to be in a dot folder, it can just be
renamed when it is being cloned into the home directory.
Things got messy after logging in to a machine
Vim folder messed up
Merge went strangely