cleaned up commented out settings
added powerline module (branch develop)