minor changes
commit merged version

Merge branch 'master' of git://github.com/wlyra/transitional-disk

Conflicts:
	tex/trapping.tex
backup
Merge branch 'master' of https://github.com/wlyra/transitional-disk
Modified figure for Gaussian plot (Fig 2)
backup
Merge branch 'master' of https://github.com/wlyra/transitional-disk
Figure 3 - figure and code (bessel vs gaussian)
Merge branch 'master' of https://github.com/wlyra/transitional-disk
Added figure 3, removed redundant Sect 4.2 (moved to after 4.1)
backup
backup
Figure 4: Code and figure.
nonaxi fig
Merge branch 'master' of https://github.com/wlyra/transitional-disk
nonaxi fig
Added figure captions.
nonaxi fig
Merge branch 'master' of https://github.com/wlyra/transitional-disk

Conflicts:
	tex/trapping.tex
nonaxi v3 with fig