Merge branch 'master' into dev

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### v0.2.2
  + Allow to set tmp file with environment variable “OC\_TMP”. See #9 and #6
  + Add unit tests, to improve stability
+ + Allow to install from opam throw opam pin add <pkg> <repo>
  + Clean help
  + Better display after editing an entry. Ignore empty lines and fix #10
  + Use lazyness to speed up and lead to less error

TODO.md

@@ -15,6 +15,9 @@
 
 ## Short term
 
+ + Add command --edit-rc to edit configuration file
+ + Add command to exchange item
+
 ### Configuration value
  + Allow to run infinitely or say when it is finish
  + Make tmp file emplacement configurable
@@ -27,15 +30,11 @@
  + Relaunch the terminal detached after (possible -> use $TERM &; it resists to
    program exit)
  + Allow to tag entry and do things according to tags
- + Display text before and after, maybe in color (For example
-   "================================================")
 
 ### Misc
  + Documentation ;-)
  + Handle errors in reading rc file
  + Return error code when necessary
- + Add build info in binary for 0install
- + Use color in messages
 
 ## Long term
  + Translate displayed messages.