These are about to get wiped out
nginx, org-mode misc
Merge branch 'master' of github.com:bowenl2/dotfiles

Conflicts:
	home/.emacs.d/elpa/org-20140224/ob-C.elc
	home/.emacs.d/elpa/org-20140224/ob-R.elc
	home/.emacs.d/elpa/org-20140224/ob-asymptote.elc
	home/.emacs.d/elpa/org-20140224/ob-awk.elc
	home/.emacs.d/elpa/org-20140224/ob-calc.elc
	home/.emacs.d/elpa/org-20140224/ob-clojure.elc
	home/.emacs.d/elpa/org-20140224/ob-comint.elc
	home/.emacs.d/elpa/org-20140224/ob-core.elc
	home/.emacs.d/elpa/org-20140224/ob-css.elc
	home/.emacs.d/elpa/org-20140224/ob-ditaa.elc
	home/.emacs.d/elpa/org-20140224/ob-dot.elc
	home/.emacs.d/elpa/org-20140224/ob-emacs-lisp.elc
	home/.emacs.d/elpa/org-20140224/ob-eval.elc
	home/.emacs.d/elpa/org-20140224/ob-exp.elc
	home/.emacs.d/elpa/org-20140224/ob-fortran.elc
	home/.emacs.d/elpa/org-20140224/ob-gnuplot.elc
	home/.emacs.d/elpa/org-20140224/ob-haskell.elc
	home/.emacs.d/elpa/org-20140224/ob-io.elc
	home/.emacs.d/elpa/org-20140224/ob-java.elc
	home/.emacs.d/elpa/org-20140224/ob-js.elc
	home/.emacs.d/elpa/org-20140224/ob-keys.elc
	home/.emacs.d/elpa/org-20140224/ob-latex.elc
	home/.emacs.d/elpa/org-20140224/ob-ledger.elc
	home/.emacs.d/elpa/org-20140224/ob-lilypond.elc
	home/.emacs.d/elpa/org-20140224/ob-lisp.elc
	home/.emacs.d/elpa/org-20140224/ob-lob.elc
	home/.emacs.d/elpa/org-20140224/ob-makefile.elc
	home/.emacs.d/elpa/org-20140224/ob-matlab.elc
	home/.emacs.d/elpa/org-20140224/ob-maxima.elc
	home/.emacs.d/elpa/org-20140224/ob-mscgen.elc
	home/.emacs.d/elpa/org-20140224/ob-ocaml.elc
	home/.emacs.d/elpa/org-20140224/ob-octave.elc
	home/.emacs.d/elpa/org-20140224/ob-org.elc
	home/.emacs.d/elpa/org-20140224/ob-perl.elc
	home/.emacs.d/elpa/org-20140224/ob-picolisp.elc
	home/.emacs.d/elpa/org-20140224/ob-plantuml.elc
	home/.emacs.d/elpa/org-20140224/ob-python.elc
	home/.emacs.d/elpa/org-20140224/ob-ref.elc
	home/.emacs.d/elpa/org-20140224/ob-ruby.elc
	home/.emacs.d/elpa/org-20140224/ob-sass.elc
	home/.emacs.d/elpa/org-20140224/ob-scala.elc
	home/.emacs.d/elpa/org-20140224/ob-scheme.elc
	home/.emacs.d/elpa/org-20140224/ob-screen.elc
	home/.emacs.d/elpa/org-20140224/ob-sh.elc
	home/.emacs.d/elpa/org-20140224/ob-shen.elc
	home/.emacs.d/elpa/org-20140224/ob-sql.elc
	home/.emacs.d/elpa/org-20140224/ob-sqlite.elc
	home/.emacs.d/elpa/org-20140224/ob-table.elc
	home/.emacs.d/elpa/org-20140224/ob-tangle.elc
	home/.emacs.d/elpa/org-20140224/ob.elc
	home/.emacs.d/elpa/org-20140224/org-agenda.elc
	home/.emacs.d/elpa/org-20140224/org-archive.elc
	home/.emacs.d/elpa/org-20140224/org-attach.elc
	home/.emacs.d/elpa/org-20140224/org-autoloads.el
	home/.emacs.d/elpa/org-20140224/org-bbdb.elc
	home/.emacs.d/elpa/org-20140224/org-bibtex.elc
	home/.emacs.d/elpa/org-20140224/org-capture.elc
	home/.emacs.d/elpa/org-20140224/org-clock.elc
	home/.emacs.d/elpa/org-20140224/org-colview.elc
	home/.emacs.d/elpa/org-20140224/org-compat.elc
	home/.emacs.d/elpa/org-20140224/org-crypt.elc
	home/.emacs.d/elpa/org-20140224/org-ctags.elc
	home/.emacs.d/elpa/org-20140224/org-datetree.elc
	home/.emacs.d/elpa/org-20140224/org-docview.elc
	home/.emacs.d/elpa/org-20140224/org-element.elc
	home/.emacs.d/elpa/org-20140224/org-entities.elc
	home/.emacs.d/elpa/org-20140224/org-eshell.elc
	home/.emacs.d/elpa/org-20140224/org-faces.elc
	home/.emacs.d/elpa/org-20140224/org-feed.elc
	home/.emacs.d/elpa/org-20140224/org-footnote.elc
	home/.emacs.d/elpa/org-20140224/org-gnus.elc
	home/.emacs.d/elpa/org-20140224/org-habit.elc
	home/.emacs.d/elpa/org-20140224/org-id.elc
	home/.emacs.d/elpa/org-20140224/org-indent.elc
	home/.emacs.d/elpa/org-20140224/org-info.elc
	home/.emacs.d/elpa/org-20140224/org-inlinetask.elc
	home/.emacs.d/elpa/org-20140224/org-irc.elc
	home/.emacs.d/elpa/org-20140224/org-list.elc
	home/.emacs.d/elpa/org-20140224/org-macro.elc
	home/.emacs.d/elpa/org-20140224/org-macs.elc
	home/.emacs.d/elpa/org-20140224/org-mhe.elc
	home/.emacs.d/elpa/org-20140224/org-mobile.elc
	home/.emacs.d/elpa/org-20140224/org-mouse.elc
	home/.emacs.d/elpa/org-20140224/org-pcomplete.elc
	home/.emacs.d/elpa/org-20140224/org-pkg.elc
	home/.emacs.d/elpa/org-20140224/org-plot.elc
	home/.emacs.d/elpa/org-20140224/org-protocol.elc
	home/.emacs.d/elpa/org-20140224/org-rmail.elc
	home/.emacs.d/elpa/org-20140224/org-src.elc
	home/.emacs.d/elpa/org-20140224/org-table.elc
	home/.emacs.d/elpa/org-20140224/org-timer.elc
	home/.emacs.d/elpa/org-20140224/org-w3m.elc
	home/.emacs.d/elpa/org-20140224/org.elc
	home/.emacs.d/elpa/org-20140224/ox-ascii.elc
	home/.emacs.d/elpa/org-20140224/ox-beamer.elc
	home/.emacs.d/elpa/org-20140224/ox-html.elc
	home/.emacs.d/elpa/org-20140224/ox-icalendar.elc
	home/.emacs.d/elpa/org-20140224/ox-latex.elc
	home/.emacs.d/elpa/org-20140224/ox-man.elc
	home/.emacs.d/elpa/org-20140224/ox-md.elc
	home/.emacs.d/elpa/org-20140224/ox-odt.elc
	home/.emacs.d/elpa/org-20140224/ox-org.elc
	home/.emacs.d/elpa/org-20140224/ox-publish.elc
	home/.emacs.d/elpa/org-20140224/ox-texinfo.elc
	home/.emacs.d/elpa/org-20140224/ox.elc
	home/.emacs.d/url/cookies
Merge branch 'master' of github.com:bowenl2/dotfiles
Now there's a real powerline.conf.