Merge pull request #1 from blinktrade/master

pulling latest changes
improved deploy script
adjusting baseurl
Merge pull request #12 from chilebit/master

deploy script