updated solr dependency to use 4.6.0
adapting travis build to VM changes
testing limits of markdown [skip ci]
testing embedding javascript in md
changed to only include master branch in readme's travis status icon
Merge branch 'develop'