updating circle [ci skip]
Merge branch 'dev' into master
Merge tag '0.1.2' [ci skip]
Merge branch 'dev' into 'master'
Merge tag 'rc20140915a' into 'master'
updated circle to fail on deploy error [ci skip]
Merge pull request #12 from Shangodev/circlefix

updated circle to fail on deploy error [ci skip]
Merge branch 'master' into dev