style cleanup
fix map spec
add zoomControlPosition option
pass unit test
add unit test for zoomControlPosition option
Fixed some bugs when a marker updates its model
Merge branch 'master' of github.com:tombatossals/angular-leaflet-directive into houqp-master

Conflicts:
	src/angular-leaflet-directive.js
Fixed update marker bugs and OSM attribution
Fixed update marker bugs and OSM attribution
Updated karma config to export a function

http://karma-runner.github.io/0.10/config/configuration-file.html

Was receiving errors when trying to run karma tests. Had to update the
config file to export a function and use the jasmine framework.
Updated unit test to check for initialization of new initial zoom level
Merge pull request #98 from JaumeFigueras/master

Fixed some bugs when a marker updates its model
Merge branch 'master' of github.com:tombatossals/angular-leaflet-directive into houqp-master
Merge pull request #103 from grantlucas/grantlucas_karma_config_update

Update Karma Config
Merge branch 'master' of github.com:tombatossals/angular-leaflet-directive into houqp-master
switch back to headless phantomJS browser
Fixed tabs and spaces for jshint
Fixed attribution in test case
Merge pull request #105 from JaumeFigueras/master

Fixed tabs and spaces for jshint
Merge pull request #96 from houqp/houqp-master

add zoomControlPosition option