Added some paredit stuff, and detabification