Fixed some bugs, some cleanups and added gulp
Merge pull request #13 from caferrari/master

Fixed some bugs, some cleanups and added gulp