Merge remote-tracking branch 'upstream/master'

Conflicts:
	bower.json
	package.json

.gitignore

@@ -1,11 +1,10 @@
-.grunt
-docs-build
-bower_components
 node_modules
+bower_components
 bootstrap-tour.sublime-project
 bootstrap-tour.sublime-workspace
 npm-debug.log
-test/spec
+test
+docs
 _SpecRunner.html
 *.DS_Store
 smart.lock

.travis.yml

@@ -1,8 +1,11 @@
 language: node_js
 node_js:
-  - "0.8"
+  - "0.10"
+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
 before_script:
-  - npm install -g grunt-cli
+  - npm install -g gulp
   - npm install -g bower
   - bower install
 branches:

README.md

@@ -1,8 +1,8 @@
 # Bootstrap Tour
-[![Build Status](http://img.shields.io/travis/sorich87/bootstrap-tour.svg)](https://travis-ci.org/sorich87/bootstrap-tour)
-[![Dependency Status](https://david-dm.org/sorich87/bootstrap-tour.svg?theme=shields.io)](https://david-dm.org/sorich87/bootstrap-tour)
-[![devDependency Status](https://david-dm.org/sorich87/bootstrap-tour/dev-status.svg?theme=shields.io)](https://david-dm.org/sorich87/bootstrap-tour#info=devDependencies)
-[![NPM Version](http://img.shields.io/npm/v/bootstrap-tour.svg)](https://www.npmjs.org/)
+[![Build Status](http://img.shields.io/travis/sorich87/bootstrap-tour.svg?style=flat)](https://travis-ci.org/sorich87/bootstrap-tour)
+[![Dependency Status](http://img.shields.io/david/sorich87/bootstrap-tour.svg?style=flat)](https://david-dm.org/sorich87/bootstrap-tour)
+[![devDependency Status](http://img.shields.io/david/dev/sorich87/bootstrap-tour/dev-status.svg?style=flat)](https://david-dm.org/sorich87/bootstrap-tour#info=devDependencies)
+[![NPM Version](http://img.shields.io/npm/v/bootstrap-tour.svg?style=flat)](https://www.npmjs.org/)
 
 Quick and easy way to build your product tours with Bootstrap Popovers.
 
@@ -12,43 +12,64 @@ Quick and easy way to build your product tours with Bootstrap Popovers.
 [http://bootstraptour.com](http://bootstraptour.com)
 
 ## Contributing
-In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/).
+In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests for any new or changed functionality. Lint and test your code using [Gulp](http://gulpjs.com/).
 
 Feel free to contribute with pull requests, bug reports or enhancement suggestions.
 
-We use [Grunt](http://gruntjs.com/) and [Jasmine](http://pivotal.github.io/jasmine/). Both make your lives easier ;)
+We use [Gulp](http://gulpjs.com/) and [Jasmine](http://pivotal.github.io/jasmine/). Both make your life easier ;)
 
-### How to build/develop
+### Develop
 
-Files to be developed are located under `./src/`
-Compiled sources are then automatically put under `./build/` (and `./test/`)
+Files to be developed are located under `./src/`.
+Compiled sources are then automatically put under `./build/`, `./test/` and `./docs/`.
 
-#### Installing the dependencies
+#### Requirements
+
+To begin, you need a few standard dependencies installed. These commands will install ruby, gem, node, npm, and grunt's command line runner:
+
+##### Linux
+
+```bash
+$ sudo apt-get install ruby
+$ sudo apt-get install ruby-dev
+$ sudo apt-get install npm
+$ sudo apt-get install nodejs-legacy
+```
+
+##### Mac OS X
+
+```bash
+ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
+\curl -L https://get.rvm.io | bash
+rvm install ruby-2.1.1
+brew install node
+```
+
+##### Development requirements
 
 ```bash
-npm install
-gem install jekyll
+$ npm install -g gulp
+$ npm install
+$ gem install jekyll
 ```
 
-Note for Mac OS X Mavericks (10.9) users: You will need to [jump through all these hoops](http://dean.io/setting-up-a-ruby-on-rails-development-environment-on-mavericks/) before you can install Jekyll.
-
-#### Running Grunt tasks
-
-```javascript
-// Start a server and run the demo page
-grunt
-grunt go
-// Compile all sources
-grunt build
-// Compile all sources and run the tests
-grunt test
-// Automatically release a new version
-grunt release // patch release
-grunt release:minor // minor release
-grunt release:major // major release
+For Mac OS X Mavericks (10.9) users: You will need to [jump through all these hoops](http://dean.io/setting-up-a-ruby-on-rails-development-environment-on-mavericks/) before you can install Jekyll.
+
+#### Gulp usage
+
+Run gulp and start to develop with ease:
+
+```bash
+$ gulp
+$ gulp dist
+$ gulp test
+$ gulp docs
+$ gulp clean
+$ gulp server
+$ gulp bump --type minor (major.minor.patch)
 ```
 
-Check `Gruntfile.coffee` for more infos.
+Check `gulpfile.coffee` to know more.
 
 ## License
 

_config.yml

@@ -1,5 +1,5 @@
 markdown:         rdiscount
 permalink:        pretty
-source:           ./docs
-destination:      ./docs-build
+source:           ./src/docs
+destination:      ./docs
 encoding:         UTF-8

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-tour",
-  "version": "0.9.4",
+  "version": "0.10.1",
   "main": [
     "./build/js/bootstrap-tour.js",
     "./build/js/bootstrap-tour-standalone.js",
@@ -12,6 +12,9 @@
     "jquery": ">=1.9.0"
   },
   "devDependencies": {
-    "bootstrap": "~3.1.1"
+    "html5shiv": "~3.7.2",
+    "jquery": "~2.1.1",
+    "bootstrap": "~3.2.0",
+    "blueimp-md5": "~1.1.0"
   }
 }