Making align member vars private
Render behavior quick test fix
Merge pull request #1370 from palantir/alignPrivateVars

Making align member vars private
Merge pull request #1372 from palantir/renderBehaviorFix

Render behavior quick test fix
Merge branch 'develop' into typescript-1.3
Merge branch 'typescript-1.3' into protected
Merge branch 'protected' into componentProtected

Conflicts:
	plottable.d.ts
	src/components/abstractComponent.ts