Updated Everything

Much more flexible. Things work. Longer version number?

Signed-off-by: Norman Cao <maplenormandy@gmail.com>
Merge branch 'master' of github.com:styu/parsnip