Merge branch 'master' of https://github.com/goedman/Jags.jl

# Conflicts:
#	Examples/Line1/jline1.jl

.travis.yml

@@ -1,4 +1,15 @@
-language:julia
+# Documentation: http://docs.travis-ci.com/user/languages/julia/
+language: julia
+os:
+  - linux
+  - osx
 julia:
-  - 0.3
-  - 0.4
+#  - release
+  - nightly
+notifications:
+  email: true
+# uncomment the following lines to override the default test script
+#script:
+#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+#  - julia -e 'Pkg.clone(pwd()); Pkg.build("Jags"); Pkg.test("Jags"; coverage=true)'
+

README.md

@@ -1,8 +1,10 @@
 # Jags
 
+[![Travis Build Status](https://travis-ci.org/goedman/Jags.jl.svg?branch=master)](https://travis-ci.org/goedman/Jags.jl)
 
 [![Jags](http://pkg.julialang.org/badges/Jags_0.4.svg)](http://pkg.julialang.org/?pkg=Jags&ver=0.4)
-[![Jags](http://pkg.julialang.org/badges/Jags_1.0.svg)](http://pkg.julialang.org/?pkg=Jags&ver=1.0)
+
+[![Jags](http://pkg.julialang.org/badges/Jags_0.5.svg)](http://pkg.julialang.org/?pkg=Jags&ver=0.5)
 
 ## Purpose
 
@@ -160,7 +162,6 @@ inits = [
   Dict("alpha" => 3,"beta" => 3,"tau" => 2),
   Dict("alpha" => 5,"beta" => 2,"tau" => 5)
 ]
-inits = map((x)->convert(Dict{String, Any}, x), inits)
 
 println("\nInput initial values dictionary:")
 inits |> display
@@ -265,6 +266,4 @@ The first entry in the 'inits' array will be passed into the first chain in the
 
 More features will be added as requested by users and as time permits. Please file an issue/comment/request.
 
-The ability to resume a simulation will e looked at for version 0.2.x.
-
 **Note 1:** In order to support platforms other than OS X, help is needed to test on such platforms.